tests/test-merge2.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 04 Aug 2005 18:13:17 +0100
changeset 833 ad8ff3534fde
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
Removed special FIXME handling in run-tests, added bug info to .out files.

+ 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