tests/test-merge5.out
author mpm@selenic.com
Tue, 16 Aug 2005 19:03:01 -0800
changeset 925 5a034646e472
parent 839 9c918287d10b
child 2019 ced2d3620f95
permissions -rw-r--r--
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.

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)