Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 34942:2a774cae3a03 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: disable path conflict checking by default (issue5716) We shouldn't ship a severe perf regression in hg update for 4.4. Differential Revision: https://phab.mercurial-scm.org/D1223
author Siddharth Agarwal <sid0@fb.com>
date Tue, 24 Oct 2017 11:15:30 -0700
parents 8c9b08a0c48c
children 5c6b96b832c2 ebabc4a805c4
line wrap: on
line diff