Mercurial > hg-stable

diff tests/test-merge-subrepos.t @ 19803:0f64af33fb63

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: standardize error message for dirty subrepo
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 20:53:14 -0700
parents 6169493ac3f9
children 439b4d005b4a
line wrap: on
line diff
--- 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]