Mercurial > hg

diff hgext/transplant.py @ 46169:714085c1b800

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergetools: enable the `checkconflicts` option for Araxis Merge This must have been a typo. This matches the config read in filemerge, as well as the TortoiseHg config file. Differential Revision: https://phab.mercurial-scm.org/D9633
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 19 Dec 2020 01:15:44 -0500
parents 59fa3890d40a
children 0428e555acb7
line wrap: on
line diff