tests/test-merge4.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 04 Aug 2005 17:16:41 +0100
changeset 829 764b0350acb8
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
Shortened hgmerge a little bit.

+ 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 c
+ hg commit -m commit #2 -d 0 0
+ hg update -m 1
+ hg commit -m commit #3 -d 0 0