changeset 12314 | f2daa6ab514a |
parent 11795 | 06793ad30575 |
child 12316 | 4134686b83e1 |
--- a/tests/test-add.t Thu Sep 16 16:00:29 2010 +0200 +++ b/tests/test-add.t Sun Sep 12 18:05:53 2010 -0500 @@ -53,7 +53,7 @@ warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 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 st M a ? a.orig