diff .hgtags @ 45282:b442920ab1de

merge: introduce mergeresult.addfile() and use it We want to use mergeresult object at more and more places instead of this actions dict to simplify code and further add new APIs to mergeresult object. This patch introduces `addfile()` which adds a new file to the internal actions dict for now. Differential Revision: https://phab.mercurial-scm.org/D8820
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 24 Jul 2020 16:18:39 +0530
parents 8119299e33fe
children 3c2591a435d9
line wrap: on
line diff