Mercurial > hg-stable

comparison tests/test-merge9 @ 7527:5a14a8f3b909

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: require -a switch to resolve all files Like revert -a, this should make this command slightly safer
author Matt Mackall <mpm@selenic.com>
date Fri, 19 Dec 2008 16:47:36 -0600
parents 92ccccb55ba3
children 30cb79d84352
comparison
equal deleted inserted replaced
7526:b7d4db95e95a 7527:5a14a8f3b909
42 hg resolve baz 42 hg resolve baz
43 43
44 echo % after 44 echo % after
45 hg resolve -l 45 hg resolve -l
46 46
47 echo % resolve all warning
48 hg resolve
49
47 echo % resolve all 50 echo % resolve all
48 hg resolve 51 hg resolve -a
49 52
50 echo % after 53 echo % after
51 hg resolve -l 54 hg resolve -l
52 55
53 true 56 true