Mercurial > hg

diff mercurial/templatekw.py @ 45333:f569ca3eb430

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: pass mergeresult obj instead of actions in _checkcollision() (API) The goal is to not use the actions dict and replace it with a rich mergeresult object. Differential Revision: https://phab.mercurial-scm.org/D8875
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 03 Aug 2020 13:30:14 +0530
parents b7808443ed6a
children 85b03b1e4715
line wrap: on
line diff