tests/test-merge-revert2
changeset 864 6225bd773c51
parent 839 9c918287d10b
child 866 6d6095823b82
equal deleted inserted replaced
863:a7e95e3606c7 864:6225bd773c51
     2 
     2 
     3 mkdir t
     3 mkdir t
     4 cd t
     4 cd t
     5 hg init
     5 hg init
     6 echo "added file1" > file1
     6 echo "added file1" > file1
       
     7 echo "another line of text" >> file1
     7 echo "added file2" > file2
     8 echo "added file2" > file2
     8 hg add file1 file2
     9 hg add file1 file2
     9 hg commit -m "added file1 and file2" -d "0 0" -u user
    10 hg commit -m "added file1 and file2" -d "0 0" -u user
    10 echo "changed file1" >> file1
    11 echo "changed file1" >> file1
    11 hg commit -m "changed file1" -d "0 0" -u user
    12 hg commit -m "changed file1" -d "0 0" -u user