Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 45215:a253ded5b03d
morestatus: mention --stop even if not using --verbose
Differential Revision: https://phab.mercurial-scm.org/D8811
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Thu, 23 Jul 2020 13:31:45 -0700 |
| parents | dc5e5577af39 |
| children | 5780a04a1b46 |
comparison
equal
deleted
inserted
replaced
| 45213:d5ccc059fbcd | 45215:a253ded5b03d |
|---|---|
| 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) |