Mercurial > hg
diff tests/test-status-color.t @ 48427:38941a28406a
mergestate: merge `preresolve()` into `resolve()`
The separation between `preresolve()` and `resolve()` was something
added for the "merge driver" feature. Since we removed that in
32ce4cbaec4b (mergedriver: delete it, 2020-09-17), we don't need the
separation anymore. More cleanups will follow.
Differential Revision: https://phab.mercurial-scm.org/D11855
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 02 Dec 2021 22:59:36 -0800 |
parents | d71b9902e2de |
children | 39c447e03dbc |
line wrap: on
line diff
--- a/tests/test-status-color.t Fri Dec 03 21:50:25 2021 -0800 +++ b/tests/test-status-color.t Thu Dec 02 22:59:36 2021 -0800 @@ -375,8 +375,8 @@ created new head $ hg merge merging a + warning: conflicts while merging a! (edit, then use 'hg resolve --mark') merging b - warning: conflicts while merging a! (edit, 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, 2 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon