merge: standardize error message for dirty subrepo

mercurial/merge.py

@@ -715,7 +715,7 b' def update(repo, node, branchmerge, forc'
                                  hint=_("use 'hg status' to list changes"))
             for s in sorted(wc.substate):
                 if wc.sub(s).dirty():
-                    raise util.Abort(_("outstanding uncommitted changes in "
+                    raise util.Abort(_("uncommitted changes in "
                                        "subrepository '%s'") % s)
 
         elif not overwrite:

tests/test-merge-subrepos.t

@@ -21,5 +21,5 b''
 Should fail, since there are added files to subrepo:
 
   $ hg merge
-  abort: outstanding uncommitted changes in subrepository 'subrepo'
+  abort: uncommitted changes in subrepository 'subrepo'
   [255]