diff hgweb.cgi @ 45283:f1fb9a079131

merge: add removefile() to mergeresult object There are cases where some further calculation makes the file not needing to be merged anymore and hence needs to be dropped in mergeresult object. This adds a function for that. Differential Revision: https://phab.mercurial-scm.org/D8821
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 24 Jul 2020 16:23:55 +0530
parents 47ef023d0165
children d58a205d0672
line wrap: on
line diff