tests/test-merge3.out
author Bryan O'Sullivan <bos@serpentine.com>
Wed, 20 Jul 2005 03:52:06 -0800
changeset 737 8db4d406b3d3
parent 402 2fe8d66e3075
child 749 7e4843b7efd2
permissions -rw-r--r--
Merge with Matt's tip.

+ 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!