diff hgeditor @ 45160:fcd0cff3400a

mergestate: remove unrequired RECORD_RESOLVED_OTHER record This was introduced in last cycle however while working on refactoring mergestate, I realized it's unncessary. This will break users who did a merge using previous version, did this kind of storage and before commiting updated the mercurial version. Differential Revision: https://phab.mercurial-scm.org/D8716
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 09 Jul 2020 15:50:02 +0530
parents 1aee2ab0f902
children
line wrap: on
line diff