Mercurial > hg-stable

diff mercurial/merge.py @ 48284:126feb805247

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
parsers: don't ask about symlinks on platforms that don't support them Otherwise the compiler gets quite sad. Differential Revision: https://phab.mercurial-scm.org/D11712
author Raphaël Gomès <rgomes@octobus.net>
date Wed, 20 Oct 2021 18:25:49 +0200
parents 96aa3a68d3b5
children 8e855e9984a6
line wrap: on
line diff