Mercurial > hg

log mercurial/merge.py @ 45288:3f5ac87ae10f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -300 -100 -30 -10 -3 tip
age author description
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)
Fri, 24 Jul 2020 17:52:33 +0530 Pulkit Goyal merge: pass mergeresult obj instead of actions dict in _resolvetrivial()
less more | (0) -300 -100 -30 -10 -3 tip