tests/test-merge4.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 29 Jul 2005 14:52:45 +0100
changeset 796 33a272b79e54
parent 749 7e4843b7efd2
child 801 1f9ec150a476
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rw-r--r--
Replaced mktemp and usage of ${par:=word}.

+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ echo This is file b1
+ hg add b
+ hg commit -m 'commit #1' -d '0 0'
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -m 'commit #2' -d '0 0'
+ hg update -m 1
+ rm b
+ echo This is file c22
+ hg commit -m 'commit #3' -d '0 0'