tests/test-merge3.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 29 Jul 2005 06:43:21 +0100
changeset 793 445970ccf57a
parent 775 122449dd89db
child 801 1f9ec150a476
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rw-r--r--
Merge with upstream

+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -m 'commit #0' -d '0 0'
+ touch b
+ hg add b
+ rm b
+ hg commit -A '-mcomment #1' -d '0 0'
adding .out
removing b
b never committed!