Mercurial > public > mercurial-scm > hg

diff tests/test-merge5.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 ab3e42225dbc
children fe80fdf68ba7
line wrap: on
line diff
--- a/tests/test-merge5.t	Mon Sep 23 20:08:52 2013 -0700
+++ b/tests/test-merge5.t	Mon Sep 23 20:33:02 2013 -0700
@@ -19,7 +19,7 @@
   [255]
   $ rm b
   $ hg update -c
-  abort: uncommitted local changes
+  abort: uncommitted changes
   [255]
   $ hg revert b
   $ hg update -c