Mercurial > public > mercurial-scm > hg-stable

diff tests/test-casecollision-merge.t @ 19801:41abe2e3e3b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: standardize error message for dirty update --check This and following patches will standardize the error message for dirty working directories to "uncommitted changes".
author Siddharth Agarwal <sid0@fb.com>
date Mon, 23 Sep 2013 20:33:02 -0700
parents 3d0dd890c525
children 7a9cbb315d84
line wrap: on
line diff
--- a/tests/test-casecollision-merge.t	Mon Sep 23 20:08:52 2013 -0700
+++ b/tests/test-casecollision-merge.t	Mon Sep 23 20:33:02 2013 -0700
@@ -293,7 +293,7 @@
   [255]
 
   $ hg update --check
-  abort: uncommitted local changes
+  abort: uncommitted changes
   [255]
 
   $ hg update --clean