Artifact 622a8fac8c8044750e5f414aa74b94648ab05711:

• File src/merge.c
  • 2013-07-12 07:58:06 — part of check-in [5f4b03ebf0] on branch merge-integrate — Minor tweaks in error/warning messages. Well-tested now. (user: jan.nijtmans size: 23118)
  • 2013-07-12 11:33:57 — part of check-in [a745092fbc] on branch merge-integrate — rebase (user: jan.nijtmans size: 23118)