Mercurial > hg

comparison mercurial/hg.py @ 39122:5d3b58472660

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: set actual capabilities of internal merge tools This information is used to detect actual capabilities of internal merge tools by subsequent patches. For convenience, this patch assumes that merge tools typed as "nomerge" have both binary files and symlinks capabilities.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Tue, 14 Aug 2018 20:08:27 +0900
parents d58958676b3c
children 143efea71c2a
comparison
equal deleted inserted replaced
39121:7c6044634957 39122:5d3b58472660