Mercurial > public > mercurial-scm > hg

diff tests/test-merge7 @ 6888:7c36a4fb05a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make commit fail when committing unresolved files
author Stefano Tortarolo <stefano.tortarolo@gmail.com>
date Wed, 13 Aug 2008 20:18:40 -0500
parents 93a4e72b4f83
children
line wrap: on
line diff
--- 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