Mercurial > hg

diff tests/test-copy-move-merge.t @ 48427:38941a28406a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 69429972ff1f
children
line wrap: on
line diff
--- a/tests/test-copy-move-merge.t	Fri Dec 03 21:50:25 2021 -0800
+++ b/tests/test-copy-move-merge.t	Thu Dec 02 22:59:36 2021 -0800
@@ -104,12 +104,12 @@
    preserving a for resolve of b
    preserving a for resolve of c
   removing a
-   b: remote moved from a -> m (premerge)
+   b: remote moved from a -> m
   picked tool ':merge' for b (binary False symlink False changedelete False)
   merging a and b to b
   my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
    premerge successful
-   c: remote moved from a -> m (premerge)
+   c: remote moved from a -> m
   picked tool ':merge' for c (binary False symlink False changedelete False)
   merging a and c to c
   my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc