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-merge7.t
branchstable
changeset 21947 b081decd9062
parent 21693 9c35f3a8cac4
child 25125 bd625cd4e5e7 
--- a/tests/test-merge7.t	Fri Jul 25 15:51:42 2014 -0500
+++ b/tests/test-merge7.t	Sat Jul 26 03:32:49 2014 +0200
@@ -57,7 +57,7 @@
   > EOF
   $ rm -f *.orig
   $ hg resolve -m test.txt
-  no more unresolved files
+  (no more unresolved files)
   $ hg commit -m "Merge 1"
 
 change test-a again
hg-stable