Mercurial > hg

diff tests/test-double-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-double-merge.t	Fri Dec 03 21:50:25 2021 -0800
+++ b/tests/test-double-merge.t	Thu Dec 02 22:59:36 2021 -0800
@@ -38,12 +38,12 @@
   starting 4 threads for background file closing (?)
    preserving foo for resolve of bar
    preserving foo for resolve of foo
-   bar: remote copied from foo -> m (premerge)
+   bar: remote copied from foo -> m
   picked tool ':merge' for bar (binary False symlink False changedelete False)
   merging foo and bar to bar
   my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
    premerge successful
-   foo: versions differ -> m (premerge)
+   foo: versions differ -> m
   picked tool ':merge' for foo (binary False symlink False changedelete False)
   merging foo
   my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc