equal
deleted
inserted
replaced
592 $ hg graft -O 7 |
592 $ hg graft -O 7 |
593 grafting 7:a5bfd90a2f29 "conflict" (tip) |
593 grafting 7:a5bfd90a2f29 "conflict" (tip) |
594 merging 1 |
594 merging 1 |
595 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
595 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
596 abort: unresolved conflicts, can't continue |
596 abort: unresolved conflicts, can't continue |
597 (use hg resolve and hg graft --continue) |
597 (use 'hg resolve' and 'hg graft --continue') |
598 [255] |
598 [255] |
599 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
599 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
600 7:a5bfd90a2f29 stable |
600 7:a5bfd90a2f29 stable |
601 $ echo 3 > 1 |
601 $ echo 3 > 1 |
602 $ hg resolve -m 1 |
602 $ hg resolve -m 1 |