diff --git a/hgext/rebase.py b/hgext/rebase.py index 53cfde2b3cf98700c7cb587b639a964aa327b35e_aGdleHQvcmViYXNlLnB5..b19b4c1df066a24c81b73512bc31d37adf5df973_aGdleHQvcmViYXNlLnB5 100644 --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -165,8 +165,8 @@ else: stats = rebasenode(repo, rev, p1, p2, state) if stats and stats[3] > 0: - raise util.Abort(_('fix unresolved conflicts with hg ' - 'resolve then run hg rebase --continue')) + raise util.Abort(_('unresolved conflicts (see hg ' + 'resolve, then hg rebase --continue)')) updatedirstate(repo, rev, target, p2) if not collapsef: newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn) diff --git a/tests/test-rebase-abort.t b/tests/test-rebase-abort.t index 53cfde2b3cf98700c7cb587b639a964aa327b35e_dGVzdHMvdGVzdC1yZWJhc2UtYWJvcnQudA==..b19b4c1df066a24c81b73512bc31d37adf5df973_dGVzdHMvdGVzdC1yZWJhc2UtYWJvcnQudA== 100644 --- a/tests/test-rebase-abort.t +++ b/tests/test-rebase-abort.t @@ -50,7 +50,7 @@ merging common warning: conflicts during merge. merging common failed! - abort: fix unresolved conflicts with hg resolve then run hg rebase --continue + abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] Abort: @@ -118,7 +118,7 @@ merging c warning: conflicts during merge. merging c failed! - abort: fix unresolved conflicts with hg resolve then run hg rebase --continue + abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] $ hg tglog diff --git a/tests/test-rebase-check-restore.t b/tests/test-rebase-check-restore.t index 53cfde2b3cf98700c7cb587b639a964aa327b35e_dGVzdHMvdGVzdC1yZWJhc2UtY2hlY2stcmVzdG9yZS50..b19b4c1df066a24c81b73512bc31d37adf5df973_dGVzdHMvdGVzdC1yZWJhc2UtY2hlY2stcmVzdG9yZS50 100644 --- a/tests/test-rebase-check-restore.t +++ b/tests/test-rebase-check-restore.t @@ -64,7 +64,7 @@ merging A warning: conflicts during merge. merging A failed! - abort: fix unresolved conflicts with hg resolve then run hg rebase --continue + abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] Solve the conflict and go on: @@ -116,7 +116,7 @@ merging A warning: conflicts during merge. merging A failed! - abort: fix unresolved conflicts with hg resolve then run hg rebase --continue + abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] Solve the conflict and go on: diff --git a/tests/test-rebase-conflicts.t b/tests/test-rebase-conflicts.t index 53cfde2b3cf98700c7cb587b639a964aa327b35e_dGVzdHMvdGVzdC1yZWJhc2UtY29uZmxpY3RzLnQ=..b19b4c1df066a24c81b73512bc31d37adf5df973_dGVzdHMvdGVzdC1yZWJhc2UtY29uZmxpY3RzLnQ= 100644 --- a/tests/test-rebase-conflicts.t +++ b/tests/test-rebase-conflicts.t @@ -59,7 +59,7 @@ merging common warning: conflicts during merge. merging common failed! - abort: fix unresolved conflicts with hg resolve then run hg rebase --continue + abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] Try to continue without solving the conflict: diff --git a/tests/test-rebase-interruptions.t b/tests/test-rebase-interruptions.t index 53cfde2b3cf98700c7cb587b639a964aa327b35e_dGVzdHMvdGVzdC1yZWJhc2UtaW50ZXJydXB0aW9ucy50..b19b4c1df066a24c81b73512bc31d37adf5df973_dGVzdHMvdGVzdC1yZWJhc2UtaW50ZXJydXB0aW9ucy50 100644 --- a/tests/test-rebase-interruptions.t +++ b/tests/test-rebase-interruptions.t @@ -57,7 +57,7 @@ merging A warning: conflicts during merge. merging A failed! - abort: fix unresolved conflicts with hg resolve then run hg rebase --continue + abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] Force a commit on C during the interruption: @@ -89,7 +89,7 @@ merging A warning: conflicts during merge. merging A failed! - abort: fix unresolved conflicts with hg resolve then run hg rebase --continue + abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] Solve the conflict and go on: @@ -143,7 +143,7 @@ merging A warning: conflicts during merge. merging A failed! - abort: fix unresolved conflicts with hg resolve then run hg rebase --continue + abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] Force a commit on B' during the interruption: diff --git a/tests/test-rebase-mq-skip.t b/tests/test-rebase-mq-skip.t index 53cfde2b3cf98700c7cb587b639a964aa327b35e_dGVzdHMvdGVzdC1yZWJhc2UtbXEtc2tpcC50..b19b4c1df066a24c81b73512bc31d37adf5df973_dGVzdHMvdGVzdC1yZWJhc2UtbXEtc2tpcC50 100644 --- a/tests/test-rebase-mq-skip.t +++ b/tests/test-rebase-mq-skip.t @@ -105,7 +105,7 @@ $ hg up -q qtip $ HGMERGE=internal:fail hg rebase - abort: fix unresolved conflicts with hg resolve then run hg rebase --continue + abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] $ HGMERGE=internal:local hg resolve --all diff --git a/tests/test-rebase-mq.t b/tests/test-rebase-mq.t index 53cfde2b3cf98700c7cb587b639a964aa327b35e_dGVzdHMvdGVzdC1yZWJhc2UtbXEudA==..b19b4c1df066a24c81b73512bc31d37adf5df973_dGVzdHMvdGVzdC1yZWJhc2UtbXEudA== 100644 --- a/tests/test-rebase-mq.t +++ b/tests/test-rebase-mq.t @@ -63,7 +63,7 @@ merging f warning: conflicts during merge. merging f failed! - abort: fix unresolved conflicts with hg resolve then run hg rebase --continue + abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] Fix the 1st conflict: @@ -74,7 +74,7 @@ merging f warning: conflicts during merge. merging f failed! - abort: fix unresolved conflicts with hg resolve then run hg rebase --continue + abort: unresolved conflicts (see hg resolve, then hg rebase --continue) [255] Fix the 2nd conflict: