tests/test-merge2
changeset 808 8f5637f0a0c0
parent 749 7e4843b7efd2
parent 800 ec85f9e6f3b1
child 814 0902ffece4b4
equal deleted inserted replaced
788:64d2a558c943 808:8f5637f0a0c0
     1 #!/bin/sh -x
     1 #!/bin/sh
     2 
     2 
     3 mkdir t
     3 mkdir t
     4 cd t
     4 cd t
     5 hg init
     5 hg init
     6 echo This is file a1 > a
     6 echo This is file a1 > a