Mercurial > hg

diff tests/test-up-local-change.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 4894e0d9462d
children 3db9e798e004
line wrap: on
line diff
--- a/tests/test-up-local-change.t	Mon Sep 23 20:33:02 2013 -0700
+++ b/tests/test-up-local-change.t	Mon Sep 23 20:50:51 2013 -0700
@@ -171,7 +171,7 @@
   (commit and merge, or update --clean to discard changes)
   [255]
   $ hg --debug merge
-  abort: outstanding uncommitted changes
+  abort: uncommitted changes
   (use 'hg status' to list changes)
   [255]
   $ hg --debug merge -f