comparison .clang-format @ 45334:b9b055f15035

merge: pass mergeresult obj instead of actions in applyupdates() (API) This is similar to past 20 patches or so where we are replacing use of a bare actions dict with a dedicated mergeresult object. The goal is to have a dedicated powerful object instead of a dict while making the code more easier to understand. In past few patches, we have already simplified the code at some places using the newly introduced object. This patch does not updates applyupdates() to use the mergeresult object directly. That will be done in next patch to make things easier to review. Differential Revision: https://phab.mercurial-scm.org/D8876
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 03 Aug 2020 14:12:13 +0530
parents d0a3fa849cb8
children
comparison
equal deleted inserted replaced
45333:f569ca3eb430 45334:b9b055f15035