Mercurial > hg
diff tests/test-graft.t @ 45488:c4f14db3da1d
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 | e5043679bfcc |
children | 8d72e29ad1e0 |
line wrap: on
line diff
--- a/tests/test-graft.t Thu Jun 25 13:16:55 2020 +0530 +++ b/tests/test-graft.t Thu Sep 03 13:25:29 2020 +0530 @@ -247,9 +247,9 @@ resolving manifests branchmerge: True, force: True, partial: False ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d - preserving e for resolve of e d: remote is newer -> g getting d + preserving e for resolve of e e: versions differ -> m (premerge) picked tool ':merge' for e (binary False symlink False changedelete False) merging e