summaryrefslogtreecommitdiff
path: root/Documentation/config/mergetool.txt
AgeCommit message (Expand)AuthorFilesLines
2021-02-09mergetool: add per-tool support and overrides for the hideResolved flagLibravatar Seth House1-0/+5
2021-02-09mergetool: add hideResolved configurationLibravatar Seth House1-0/+10
2020-09-16mergetool: allow auto-merge for meld to follow the vim-diff behaviorLibravatar Lin Sun1-0/+10
2018-10-29config.txt: move mergetool.* to a separate fileLibravatar Nguyễn Thái Ngọc Duy1-0/+53