Mercurial Mercurial > hg-stable / 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-mq-qnew.out
changeset 12314 f2daa6ab514a
parent 11575 a5903e612f07 
--- a/tests/test-mq-qnew.out	Thu Sep 16 16:00:29 2010 +0200
+++ b/tests/test-mq-qnew.out	Sun Sep 12 18:05:53 2010 -0500
@@ -53,7 +53,7 @@
 warning: conflicts during merge.
 merging a failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
 abort: cannot manage merge changesets
 %%% hg headers
 adding a
@@ -116,5 +116,5 @@
 warning: conflicts during merge.
 merging a failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
-use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
+use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
 abort: cannot manage merge changesets
hg-stable