tests/test-merge3.out
changeset 808 8f5637f0a0c0
parent 775 122449dd89db
parent 801 1f9ec150a476
child 814 0902ffece4b4
equal deleted inserted replaced
788:64d2a558c943 808:8f5637f0a0c0
     1 + hg init
     1 + hg init
     2 + echo This is file a1
       
     3 + hg add a
     2 + hg add a
     4 + hg commit -m 'commit #0' -d '0 0'
     3 + hg commit -m commit #0 -d 0 0
     5 + touch b
       
     6 + hg add b
     4 + hg add b
     7 + rm b
     5 + hg commit -A -mcomment #1 -d 0 0
     8 + hg commit -A '-mcomment #1' -d '0 0'
       
     9 adding .out
       
    10 removing b
     6 removing b
    11 b never committed!
     7 b never committed!
       
     8 nothing changed