Artifact 01124687582e45b58c1cdcfdbc2728bc2460fadc:

• File src/merge.c
  • 2010-11-08 15:33:49 — part of check-in [370a89c832] on branch trunk — Fix a typo in an error message in the merge logic. (user: drh size: 10251)
  • 2010-11-09 01:06:33 — part of check-in [a9407bc82f] on branch venks-emacs — Merge from trunk + minor changes to update.c to work with new . return from file_tree_name for fossil root. (user: venkat size: 10251)