Mercurial > hg

diff tests/test-merge-criss-cross.t @ 45488:c4f14db3da1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: move initial handling of mergeactions near to later one We build `mergeactions` in the beginning and use it in end. Let's build it just before where it will be used. Helps making code much easier to understand. Differential Revision: https://phab.mercurial-scm.org/D8983
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 03 Sep 2020 13:25:29 +0530
parents 49ffaa4f65f6
children 6877b0ee5f9d
line wrap: on
line diff
--- a/tests/test-merge-criss-cross.t	Thu Jun 25 13:16:55 2020 +0530
+++ b/tests/test-merge-criss-cross.t	Thu Sep 03 13:25:29 2020 +0530
@@ -78,9 +78,9 @@
   resolving manifests
    branchmerge: True, force: False, partial: False
    ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922
-   preserving f2 for resolve of f2
    f1: remote is newer -> g
   getting f1
+   preserving f2 for resolve of f2
    f2: versions differ -> m (premerge)
   picked tool ':dump' for f2 (binary False symlink False changedelete False)
   merging f2