Mercurial > hg

diff tests/test-merge-force.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 6c8573dd1b6b
children eeecf29cc397
line wrap: on
line diff
--- a/tests/test-merge-force.t	Mon Sep 23 20:33:02 2013 -0700
+++ b/tests/test-merge-force.t	Mon Sep 23 20:50:51 2013 -0700
@@ -19,7 +19,7 @@
 Should fail, since there are deleted files:
 
   $ hg merge
-  abort: outstanding uncommitted changes
+  abort: uncommitted changes
   (use 'hg status' to list changes)
   [255]