Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge1.t
changeset 19802 94c394653b2a
parent 19498 3ac1735a2265
child 25111 1ef96a3b8b89 
--- 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
Mercurial