Mercurial > hg-stable
graph
-
merge: add removefile() to mergeresult objectFri, 24 Jul 2020 16:23:55 +0530, by Pulkit Goyal
-
merge: introduce mergeresult.addfile() and use itFri, 24 Jul 2020 16:18:39 +0530, by Pulkit Goyal
-
merge: make mergeresult constructor initialize empty objectFri, 24 Jul 2020 15:56:11 +0530, by Pulkit Goyal
-
merge: improve documentation of fbid dict used for merge bidFri, 24 Jul 2020 15:15:20 +0530, by Pulkit Goyal
-
merge: move conversion of file-key dict to action-key dict in mergeresultFri, 24 Jul 2020 14:45:00 +0530, by Pulkit Goyal
-
merge: introduce hasconflicts() on mergeresult objectSun, 02 Aug 2020 10:12:21 -0700, by Pulkit Goyal
-
merge: remove no longer required ACTION_GET_OTHER_AND_STORETue, 14 Jul 2020 16:40:28 +0530, by Pulkit Goyal
-
merge: pass commitinfo to applyupdates() and get it stored in mergestateTue, 14 Jul 2020 16:31:52 +0530, by Pulkit Goyal