changeset 26614 | ef1eb6df7071 |
parent 16911 | 39d38f16a3f7 |
--- a/tests/test-update-renames.t Sun Oct 11 15:04:00 2015 -0700 +++ b/tests/test-update-renames.t Fri Oct 09 13:54:52 2015 -0700 @@ -20,8 +20,7 @@ $ hg up merging a and b to b - warning: conflicts during merge. - merging b incomplete! (edit conflicts, then use 'hg resolve --mark') + warning: conflicts while merging b! (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 [1]