Mercurial > hg
diff tests/test-rename-merge1.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 | b4057d001760 |
children | 69429972ff1f |
line wrap: on
line diff
--- a/tests/test-rename-merge1.t Thu Jun 25 13:16:55 2020 +0530 +++ b/tests/test-rename-merge1.t Thu Sep 03 13:25:29 2020 +0530 @@ -40,10 +40,10 @@ note: possible conflict - a2 was renamed multiple times to: b2 c2 + b2: remote created -> g + getting b2 preserving a for resolve of b removing a - b2: remote created -> g - getting b2 b: remote moved from a -> m (premerge) picked tool ':merge' for b (binary False symlink False changedelete False) merging a and b to b