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-merge7
changeset 6888 7c36a4fb05a3
parent 4387 93a4e72b4f83 
--- a/tests/test-merge7	Wed Aug 13 20:18:40 2008 -0500
+++ b/tests/test-merge7	Wed Aug 13 20:18:40 2008 -0500
@@ -43,6 +43,7 @@
 three
 EOF
 rm -f *.orig
+hg resolve -m test.txt
 hg commit -m "Merge 1" -d "1000000 0"
 
 # change test-a again
Mercurial