Mercurial > hg-stable
log
age | author | description |
---|---|---|
Fri, 24 Jul 2020 19:13:20 +0530 | Pulkit Goyal | merge: filter actions before calling _resolvetrivial() |
Fri, 24 Jul 2020 18:16:29 +0530 | Pulkit Goyal | merge: introduce mergeresult.updateactions() and use it |
Fri, 24 Jul 2020 17:57:23 +0530 | Pulkit Goyal | merge: pass mergeresult instead of actions in _checkunknownfiles() (API) |