tests/test-merge2.out
author mpm@selenic.com
Thu, 04 Aug 2005 13:27:41 -0800
changeset 836 1fe3b14c7044
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
Merge with TAH

+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg update 0
+ hg add b
+ hg commit -m commit #2 -d 0 0
+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg update 0
+ hg commit -A -m commit #2 -d 0 0
adding b
+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg remove b
+ hg update 0
+ hg commit -A -m commit #2 -d 0 0
adding b