Fri, 24 Jul 2020 14:45:00 +0530 | Pulkit Goyal | merge: move conversion of file-key dict to action-key dict in mergeresult | changeset | files |
Sun, 02 Aug 2020 10:12:21 -0700 | Pulkit Goyal | merge: introduce hasconflicts() on mergeresult object | changeset | files |
Tue, 14 Jul 2020 16:40:28 +0530 | Pulkit Goyal | merge: remove no longer required ACTION_GET_OTHER_AND_STORE | changeset | files |
Tue, 14 Jul 2020 16:31:52 +0530 | Pulkit Goyal | merge: pass commitinfo to applyupdates() and get it stored in mergestate | changeset | files |