Artifact 6593703e6787f44d9cc2cca2fa9f47a2e38c2620:

• File src/merge.c
  • 2013-01-14 01:53:19 — part of check-in [8a470fd4bc] on branch trunk — Simplifications to the SQL that determines a fork to merge when the "fossil merge" command has no VERSION argument. (user: drh size: 22282)
  • 2013-01-15 10:03:39 — part of check-in [9a88d1963f] on branch allow-backslash-in-card-filename — merge trunk (user: jan.nijtmans size: 22282)