equal
deleted
inserted
replaced
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 |