Mercurial > hg

diff mercurial/mdiff.py @ 45284:31c454a5f1a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: pass mergeresult in checkpassconflicts() instead of actions (API) This is a part of series which aims to use mergeresult obj instead of an action dictionary. Differential Revision: https://phab.mercurial-scm.org/D8822
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 24 Jul 2020 17:31:26 +0530
parents 10f48720ef95
children c8860a212770
line wrap: on
line diff