--- a/mercurial/localrepo.py Sun Mar 06 14:38:47 2011 +0100
+++ b/mercurial/localrepo.py Sun Mar 06 15:30:39 2011 +0100
@@ -976,7 +976,7 @@
for f in changes[0]:
if f in ms and ms[f] == 'u':
raise util.Abort(_("unresolved merge conflicts "
- "(see hg resolve)"))
+ "(see hg help resolve)"))
cctx = context.workingctx(self, text, user, date, extra, changes)
if editor:
--- a/tests/test-commit-unresolved.t Sun Mar 06 14:38:47 2011 +0100
+++ b/tests/test-commit-unresolved.t Sun Mar 06 15:30:39 2011 +0100
@@ -38,7 +38,7 @@
$ echo "ABCD" > A
$ hg commit -m "Merged"
- abort: unresolved merge conflicts (see hg resolve)
+ abort: unresolved merge conflicts (see hg help resolve)
[255]
Mark the conflict as resolved and commit
--- a/tests/test-rebase-conflicts.t Sun Mar 06 14:38:47 2011 +0100
+++ b/tests/test-rebase-conflicts.t Sun Mar 06 15:30:39 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: