hg-stable: revision graph

graph

less more | rev 45310: (0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 tip

merge: filter actions before calling _resolvetrivial()
Fri, 24 Jul 2020 19:13:20 +0530, by Pulkit Goyal
merge: introduce mergeresult.updateactions() and use it
Fri, 24 Jul 2020 18:16:29 +0530, by Pulkit Goyal
merge: pass mergeresult instead of actions in _checkunknownfiles() (API)
Fri, 24 Jul 2020 17:57:23 +0530, by Pulkit Goyal
merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
Fri, 24 Jul 2020 17:52:33 +0530, by Pulkit Goyal
merge: pass mergeresult obj instead of actions in _filternarrowactions()
Fri, 24 Jul 2020 17:49:13 +0530, by Pulkit Goyal
merge: pass mergeresult in checkpassconflicts() instead of actions (API)
Fri, 24 Jul 2020 17:31:26 +0530, by Pulkit Goyal

less more | rev 45310: (0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 tip