# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1379994794 25200
# Node ID 0f64af33fb630291cef9907ccc927380d46247f9
# Parent  94c394653b2a1f1bd5a1895ec9f04e664b2ca93b
merge: standardize error message for dirty subrepo

diff -r 94c394653b2a -r 0f64af33fb63 mercurial/merge.py
--- a/mercurial/merge.py	Mon Sep 23 20:50:51 2013 -0700
+++ b/mercurial/merge.py	Mon Sep 23 20:53:14 2013 -0700
@@ -715,7 +715,7 @@
                                  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:
diff -r 94c394653b2a -r 0f64af33fb63 tests/test-merge-subrepos.t
--- a/tests/test-merge-subrepos.t	Mon Sep 23 20:50:51 2013 -0700
+++ b/tests/test-merge-subrepos.t	Mon Sep 23 20:53:14 2013 -0700
@@ -21,5 +21,5 @@
 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]