changeset 12316 | 4134686b83e1 |
parent 12314 | f2daa6ab514a |
child 12328 | b63f6422d2a7 |
--- a/tests/test-status-color.t Thu Sep 16 16:12:26 2010 -0500 +++ b/tests/test-status-color.t Thu Sep 16 17:51:32 2010 -0500 @@ -268,6 +268,7 @@ 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 + [1] $ hg resolve -m b hg resolve with one unresolved, one resolved: