diff mercurial/merge.py @ 22841:18b3869179f9

merge: make error message consistent with other commands

If a merge is attempted when another merge is already ongoing, we give
the message "outstanding uncommitted merges". Many other commands
(such as backout, rebase, histedit) give the same message in singular
form. Since the singular form also seems to make more sense, let's use
that for 'hg merge' as well.

--- a/mercurial/merge.py	Fri Oct 10 10:34:52 2014 -0400
+++ b/mercurial/merge.py	Wed Oct 08 14:16:53 2014 -0700
@@ -1058,7 +1058,7 @@
 
         ### check phase
         if not overwrite and len(pl) > 1:
-            raise util.Abort(_("outstanding uncommitted merges"))
+            raise util.Abort(_("outstanding uncommitted merge"))
         if branchmerge:
             if pas == [p2]:
                 raise util.Abort(_("merging with a working directory ancestor"