tests/test-merge5.out
author "Mathieu Clabaut <mathieu.clabaut@gmail.com>"
Sat, 15 Jul 2006 13:09:46 +0200
changeset 2633 f7be7babc75a
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
[mq]: merge marker

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)