tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 17 May 2006 19:38:41 +0200
changeset 2301 7c2623aedeb4
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
Strip empty lines and trailing spaces around commit messages. Fixes issue213 and part of issue249 (trying to keep node id on import)

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)