sapling/tests/test-merge5.out
mpm@selenic.com ea7bd9ea6f run-tests: remove '+ hg' trick
This was causing me a fair amount of debugging confusion. Let's just
forget it entirely. Updated tests to match.
2005-08-16 19:03:01 -08:00

6 lines
170 B
Plaintext

removing b
this update spans a branch affecting the following files:
b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)