comparison mercurial/vfs.py @ 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 77d48738b8e0
children 89a2afe31e82
comparison
equal deleted inserted replaced
45487:78f0bb37f52d 45488:c4f14db3da1d