Fri, 24 Jul 2020 17:52:33 +0530 | Pulkit Goyal | merge: pass mergeresult obj instead of actions dict in _resolvetrivial() | changeset | files |
Fri, 24 Jul 2020 17:49:13 +0530 | Pulkit Goyal | merge: pass mergeresult obj instead of actions in _filternarrowactions() | changeset | files |
Fri, 24 Jul 2020 17:31:26 +0530 | Pulkit Goyal | merge: pass mergeresult in checkpassconflicts() instead of actions (API) | changeset | files |
Fri, 24 Jul 2020 16:23:55 +0530 | Pulkit Goyal | merge: add removefile() to mergeresult object | changeset | files |