tests/test-merge3.out
author mpm@selenic.com
Thu, 14 Jul 2005 22:56:55 -0800
changeset 705 574869103985
parent 402 2fe8d66e3075
child 749 7e4843b7efd2
permissions -rw-r--r--
Merge with TAH manifest hash: 197e0d1a0d7376a9eb72381330462f06490ab821

+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ touch b
+ hg add b
+ rm b
+ hg commit -A '-tcomment #1' -d '0 0' -u user
b never committed!