--- 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"