Mercurial > hg
comparison tests/test-fix.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 | 3ea3b85df03f |
comparison
equal
deleted
inserted
replaced
| 45213:d5ccc059fbcd | 45215:a253ded5b03d |
|---|---|
| 876 (use 'hg resolve') | 876 (use 'hg resolve') |
| 877 [255] | 877 [255] |
| 878 | 878 |
| 879 $ hg --config extensions.rebase= fix -r . | 879 $ hg --config extensions.rebase= fix -r . |
| 880 abort: rebase in progress | 880 abort: rebase in progress |
| 881 (use 'hg rebase --continue' or 'hg rebase --abort') | 881 (use 'hg rebase --continue', 'hg rebase --abort', or 'hg rebase --stop') |
| 882 [255] | 882 [255] |
| 883 | 883 |
| 884 $ cd .. | 884 $ cd .. |
| 885 | 885 |
| 886 When fixing a file that was renamed, we should diff against the source of the | 886 When fixing a file that was renamed, we should diff against the source of the |