comparison CONTRIBUTING @ 48751:59c6724ddccb

simplemerge: store input data in MergeInput I want to be able to update the file contents for support for partial conflict resolution. Having the text available (and later settable) on `MergeInput` will enable that. Differential Revision: https://phab.mercurial-scm.org/D12144
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 10 Feb 2022 11:00:32 -0800
parents a492610a2fc1
children
comparison
equal deleted inserted replaced
48750:aed8ef33db8b 48751:59c6724ddccb