equal
deleted
inserted
replaced
450 $ cat a |
450 $ cat a |
451 <<<<<<< local: aaa4406d4f0a - test: 9 |
451 <<<<<<< local: aaa4406d4f0a - test: 9 |
452 c |
452 c |
453 ======= |
453 ======= |
454 b |
454 b |
455 >>>>>>> other: 5d205f8b35b6 - bar: 1 |
455 >>>>>>> graft: 5d205f8b35b6 - bar: 1 |
456 $ echo b > a |
456 $ echo b > a |
457 $ hg resolve -m a |
457 $ hg resolve -m a |
458 (no more unresolved files) |
458 (no more unresolved files) |
459 continue: hg graft --continue |
459 continue: hg graft --continue |
460 $ hg graft -c |
460 $ hg graft -c |