comparison mercurial/filemerge.py @ 45335:2c96fd8e05f6

merge: pass mergeresult obj in merge._prefetchfiles() Differential Revision: https://phab.mercurial-scm.org/D8877
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 03 Aug 2020 14:19:06 +0530
parents aa790f7c967a
children 40411ad2f5d2
comparison
equal deleted inserted replaced
45334:b9b055f15035 45335:2c96fd8e05f6