tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 27 Apr 2006 21:58:47 +0200
changeset 2143 3053fc33f545
parent 2038 5c4496ed152d
child 2175 b2ae81a7df29
permissions -rw-r--r--
Show repo's revlog format on verify. Warn if some files use a different format.

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)