changeset 26614 | ef1eb6df7071 |
parent 26000 | 9ac4e81b9659 |
child 28034 | e7ff258f71df |
--- a/tests/test-add.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-add.t Fri Oct 09 13:54:52 2015 -0700 @@ -97,8 +97,7 @@ $ hg merge merging a - warning: conflicts during merge. - merging a incomplete! (edit conflicts, then use 'hg resolve --mark') + warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 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 [1]