Mercurial > hg
graph
-
merge: filter actions before calling _resolvetrivial()Fri, 24 Jul 2020 19:13:20 +0530, by Pulkit Goyal
-
merge: introduce mergeresult.updateactions() and use itFri, 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