tests/test-merge3
changeset 749 7e4843b7efd2
parent 402 2fe8d66e3075
child 800 ec85f9e6f3b1
child 808 8f5637f0a0c0
child 814 0902ffece4b4
equal deleted inserted replaced
748:c5df1a9c5276 749:7e4843b7efd2
     1 #!/bin/sh -x
     1 #!/bin/sh -x
     2 
     2 
     3 hg init
     3 hg init
     4 echo This is file a1 > a
     4 echo This is file a1 > a
     5 hg add a
     5 hg add a
     6 hg commit -t "commit #0" -d "0 0" -u user
     6 hg commit -m "commit #0" -d "0 0"
     7 touch b
     7 touch b
     8 hg add b
     8 hg add b
     9 rm b
     9 rm b
    10 hg commit -A -t"comment #1" -d "0 0" -u user
    10 hg commit -A -m"comment #1" -d "0 0"