tests/test-merge5.out
author mpm@selenic.com
Fri, 12 Aug 2005 23:54:09 -0800
changeset 866 6d6095823b82
parent 839 9c918287d10b
child 925 5a034646e472
permissions -rw-r--r--
Merge with TAH

+ hg init
+ hg add a b
+ hg commit -m commit #0 -d 0 0
+ hg commit -mcomment #1 -d 0 0
+ hg update 0
+ hg commit -A -mcomment #2 -d 0 0
removing b
+ hg update 1
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)