Mercurial > hg

diff mercurial/parser.py @ 34549:a991e1d6bc82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: backup conflicting directories when getting files During batchget, if a target file conflicts with a directory, or if the directory a target file is in conflicts with a file, backup and remove the conflicting file or directory before performing the get. Differential Revision: https://phab.mercurial-scm.org/D778
author Mark Thomas <mbthomas@fb.com>
date Mon, 02 Oct 2017 14:05:30 -0700
parents a8994d08e4a2
children 7840d8bd0558
line wrap: on
line diff