Artifact 865c7f4983f095583b7ee18dca1629a0d7606414:

• File src/merge.c
  • 2011-06-02 19:38:18 — part of check-in [30ebed1903] on branch ben-testing — Merge versionable settings and empty-dirs setting from versionable-settings branch (user: ben size: 15479)
  • 2011-06-02 19:38:18 — part of check-in [30ebed1903] on branch ben-testing — Merge versionable settings and empty-dirs setting from versionable-settings branch (user: ben size: 15479)