tests/test-graft.t
changeset 30460 ce3a133f71b3
parent 30229 69ffbbe73dd0
child 30581 43a9e02a7b7f
equal deleted inserted replaced
30459:bccd89b46cbf 30460:ce3a133f71b3
   454   $ cat a
   454   $ cat a
   455   <<<<<<< local: aaa4406d4f0a - test: 9
   455   <<<<<<< local: aaa4406d4f0a - test: 9
   456   c
   456   c
   457   =======
   457   =======
   458   b
   458   b
   459   >>>>>>> graft: 5d205f8b35b6  - bar: 1
   459   >>>>>>> graft: 5d205f8b35b6 - bar: 1
   460   $ echo b > a
   460   $ echo b > a
   461   $ hg resolve -m a
   461   $ hg resolve -m a
   462   (no more unresolved files)
   462   (no more unresolved files)
   463   continue: hg graft --continue
   463   continue: hg graft --continue
   464   $ hg graft -c
   464   $ hg graft -c