Mercurial > hg
log
age | author | description |
---|---|---|
Fri, 24 Jul 2020 16:18:39 +0530 | Pulkit Goyal | merge: introduce mergeresult.addfile() and use it |
Fri, 24 Jul 2020 15:56:11 +0530 | Pulkit Goyal | merge: make mergeresult constructor initialize empty object |
Fri, 24 Jul 2020 15:15:20 +0530 | Pulkit Goyal | merge: improve documentation of fbid dict used for merge bid |
Fri, 24 Jul 2020 14:45:00 +0530 | Pulkit Goyal | merge: move conversion of file-key dict to action-key dict in mergeresult |
Sun, 02 Aug 2020 10:12:21 -0700 | Pulkit Goyal | merge: introduce hasconflicts() on mergeresult object |
Tue, 14 Jul 2020 16:40:28 +0530 | Pulkit Goyal | merge: remove no longer required ACTION_GET_OTHER_AND_STORE |
Tue, 14 Jul 2020 16:31:52 +0530 | Pulkit Goyal | merge: pass commitinfo to applyupdates() and get it stored in mergestate |