changeset 12314 | f2daa6ab514a |
parent 12156 | 4c94b6d0fb1c |
child 12316 | 4134686b83e1 |
--- a/tests/test-status-color.t Thu Sep 16 16:00:29 2010 +0200 +++ b/tests/test-status-color.t Sun Sep 12 18:05:53 2010 -0500 @@ -267,7 +267,7 @@ warning: conflicts during merge. merging b failed! 0 files updated, 0 files merged, 0 files removed, 2 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon $ hg resolve -m b hg resolve with one unresolved, one resolved: