tests/test-merge3.out
changeset 749 7e4843b7efd2
parent 402 2fe8d66e3075
child 767 61ed30e82b27
equal deleted inserted replaced
748:c5df1a9c5276 749:7e4843b7efd2
     1 + hg init
     1 + hg init
     2 + echo This is file a1
     2 + echo This is file a1
     3 + hg add a
     3 + hg add a
     4 + hg commit -t 'commit #0' -d '0 0' -u user
     4 + hg commit -m 'commit #0' -d '0 0'
     5 + touch b
     5 + touch b
     6 + hg add b
     6 + hg add b
     7 + rm b
     7 + rm b
     8 + hg commit -A '-tcomment #1' -d '0 0' -u user
     8 + hg commit -A '-mcomment #1' -d '0 0'
     9 b never committed!
     9 b never committed!