Mercurial Mercurial > mercurial / 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-merge7.t
changeset 21266 19d6fec60b81
parent 18605 bcf29565d89f
child 21267 e4f451c8c05c 
--- a/tests/test-merge7.t	Fri Apr 18 18:56:26 2014 -0700
+++ b/tests/test-merge7.t	Fri Apr 18 22:19:25 2014 -0700
@@ -57,6 +57,7 @@
   > EOF
   $ rm -f *.orig
   $ hg resolve -m test.txt
+  no unresolved files; you may continue your unfinished operation
   $ hg commit -m "Merge 1"
 
 change test-a again
mercurial