changeset 7527 | 5a14a8f3b909 |
parent 7116 | e981725da3fe |
child 8167 | 6c82beaaa11a |
--- a/tests/test-keyword Fri Dec 19 21:38:01 2008 +0100 +++ b/tests/test-keyword Fri Dec 19 16:47:36 2008 -0600 @@ -322,7 +322,7 @@ echo % keyword stays outside conflict zone cat m echo % resolve to local -HGMERGE=internal:local hg resolve +HGMERGE=internal:local hg resolve -a hg commit -m localresolve cat m