Mercurial > public > mercurial-scm > hg

diff tests/test-merge1.t @ 19802:94c394653b2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: standardize error message for dirty working dir
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 20:50:51 -0700
parents 3ac1735a2265
children 1ef96a3b8b89
line wrap: on
line diff
--- a/tests/test-merge1.t	Mon Sep 23 20:33:02 2013 -0700
+++ b/tests/test-merge1.t	Mon Sep 23 20:50:51 2013 -0700
@@ -140,7 +140,7 @@
   $ echo This is file b22 > b
 merge fails
   $ hg merge 2
-  abort: outstanding uncommitted changes
+  abort: uncommitted changes
   (use 'hg status' to list changes)
   [255]
 merge expected!
@@ -177,7 +177,7 @@
   $ echo This is file b33 > b
 merge of b should fail
   $ hg merge 2
-  abort: outstanding uncommitted changes
+  abort: uncommitted changes
   (use 'hg status' to list changes)
   [255]
 merge of b expected