tests/test-merge5.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Wed, 12 Jul 2006 15:47:12 -0700
changeset 2608 ed344f948bd4
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
merge with mathieu clabaut.

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)