| author | Christian Ebert <blacktrash@gmx.net> |
| Sun, 07 Jun 2009 01:31:03 +0200 | |
| changeset 559 | f6af6e742612 |
| parent 557 | 05cf88057fc5 (current diff) |
| parent 558 | e86eaa71219d (diff) |
| child 561 | efeb09cb3760 |
--- a/tests/test-keyword Thu Jun 04 09:16:22 2009 +0200 +++ b/tests/test-keyword Sun Jun 07 01:31:03 2009 +0200 @@ -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