diff -r 41abe2e3e3b7 -r 94c394653b2a mercurial/merge.py
--- a/mercurial/merge.py	Mon Sep 23 20:33:02 2013 -0700
+++ b/mercurial/merge.py	Mon Sep 23 20:50:51 2013 -0700
@@ -711,7 +711,7 @@
                                      hint=_("use 'hg update' "
                                             "or check 'hg heads'"))
             if not force and (wc.files() or wc.deleted()):
-                raise util.Abort(_("outstanding uncommitted changes"),
+                raise util.Abort(_("uncommitted changes"),
                                  hint=_("use 'hg status' to list changes"))
             for s in sorted(wc.substate):
                 if wc.sub(s).dirty():