tests/test-commit
changeset 6386 bae2e9c838e9
parent 6112 5ffa962783c4
child 6719 42dbf9548bc6
equal deleted inserted replaced
6385:0d4e068e9e52 6386:bae2e9c838e9
    83 cd foo
    83 cd foo
    84 hg log .
    84 hg log .
    85 cd ..
    85 cd ..
    86 cd ..
    86 cd ..
    87 
    87 
       
    88 cd ..
       
    89 hg init issue1049
       
    90 cd issue1049
       
    91 echo a > a
       
    92 hg ci -Ama
       
    93 echo a >> a
       
    94 hg ci -mb
       
    95 hg up 0
       
    96 echo b >> a
       
    97 hg ci -mc
       
    98 HGMERGE=true hg merge
       
    99 echo % should fail because we are specifying a file name
       
   100 hg ci -mmerge a
       
   101 echo % should fail because we are specifying a pattern
       
   102 hg ci -mmerge -I a
       
   103 echo % should succeed
       
   104 hg ci -mmerge
       
   105 
    88 exit 0
   106 exit 0