Mercurial > hg-stable

diff tests/test-add @ 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 883d887c6408
children b9a8b616521d
line wrap: on
line diff
--- a/tests/test-add	Wed Aug 13 20:18:40 2008 -0500
+++ b/tests/test-add	Wed Aug 13 20:18:40 2008 -0500
@@ -32,6 +32,7 @@
 echo % should fail
 hg add a
 hg st
+hg resolve -m a
 hg ci -m merge
 
 echo % issue683