Mercurial > hg
comparison mercurial/worker.py @ 39122:5d3b58472660
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 | c08ea1e219c0 |
children | 909c31805f54 03f7d0822ec1 |
comparison
equal
deleted
inserted
replaced
39121:7c6044634957 | 39122:5d3b58472660 |
---|