tests/test-merge5.out
author Christian Ebert <blacktrash@gmx.net>
Thu, 27 Jul 2006 22:28:03 +0200
changeset 2706 4af7b178976a
parent 2175 b2ae81a7df29
child 2830 49988d9f0758
permissions -rw-r--r--
patchbomb: optionally send patches as inline attachments

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)