--- a/mercurial/merge.py Wed Jun 16 00:22:10 2010 +0200
+++ b/mercurial/merge.py Sun Jun 20 14:21:56 2010 -0500
@@ -467,7 +467,8 @@
raise util.Abort(_("outstanding uncommitted merges"))
if branchmerge:
if pa == p2:
- raise util.Abort(_("can't merge with ancestor"))
+ raise util.Abort(_("merging with a working directory ancestor"
+ " has no effect"))
elif pa == p1:
if p1.branch() != p2.branch():
fastforward = True
--- a/tests/test-issue619.out Wed Jun 16 00:22:10 2010 +0200
+++ b/tests/test-issue619.out Sun Jun 20 14:21:56 2010 -0500
@@ -6,5 +6,5 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bogus fast-forward should fail
-abort: can't merge with ancestor
+abort: merging with a working directory ancestor has no effect
done