Mercurial > hg

comparison 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
comparison
equal deleted inserted replaced
6887:304484c7e0ba 6888:7c36a4fb05a3
30 hg merge 30 hg merge
31 hg st 31 hg st
32 echo % should fail 32 echo % should fail
33 hg add a 33 hg add a
34 hg st 34 hg st
35 hg resolve -m a
35 hg ci -m merge 36 hg ci -m merge
36 37
37 echo % issue683 38 echo % issue683
38 hg rm a 39 hg rm a
39 hg st 40 hg st