equal
deleted
inserted
replaced
899 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
899 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') |
900 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
900 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
901 [1] |
901 [1] |
902 $ hg rebase -r 3 -d 1 -t:merge3 |
902 $ hg rebase -r 3 -d 1 -t:merge3 |
903 abort: rebase in progress |
903 abort: rebase in progress |
904 (use 'hg rebase --continue' or 'hg rebase --abort') |
904 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |
905 [255] |
905 [255] |
906 $ hg resolve --list |
906 $ hg resolve --list |
907 U foo |
907 U foo |
908 $ hg resolve --all --re-merge -t:other |
908 $ hg resolve --all --re-merge -t:other |
909 (no more unresolved files) |
909 (no more unresolved files) |