branch | stable |
changeset 13541 | 919174c0aaff |
parent 12896 | b19b4c1df066 |
child 15501 | 2371f4aea665 |
--- a/tests/test-rebase-conflicts.t Fri Mar 04 19:21:12 2011 -0600 +++ b/tests/test-rebase-conflicts.t Sun Mar 06 15:21:50 2011 +0100 @@ -65,7 +65,7 @@ Try to continue without solving the conflict: $ hg rebase --continue - abort: unresolved merge conflicts (see hg resolve) + abort: unresolved merge conflicts (see hg help resolve) [255] Conclude rebase: