equal
deleted
inserted
replaced
488 $ hg resolve --all --debug |
488 $ hg resolve --all --debug |
489 picked tool 'internal:merge' for foo (binary False symlink False) |
489 picked tool 'internal:merge' for foo (binary False symlink False) |
490 merging foo |
490 merging foo |
491 my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 |
491 my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437 |
492 premerge successful |
492 premerge successful |
493 no unresolved files; you may continue your unfinished operation |
493 no more unresolved files |
494 $ hg status |
494 $ hg status |
495 M foo |
495 M foo |
496 ? foo.orig |
496 ? foo.orig |
497 $ hg resolve -l |
497 $ hg resolve -l |
498 R foo |
498 R foo |