summaryrefslogtreecommitdiffstats
path: root/Documentation/config/mergetool.txt (follow)
Commit message (Expand)AuthorAgeFilesLines
* mergetool: do not enable hideResolved by defaultJonathan Nieder2021-03-141-1/+1
* mergetool: add per-tool support and overrides for the hideResolved flagSeth House2021-02-091-0/+5
* mergetool: add hideResolved configurationSeth House2021-02-091-0/+10
* mergetool: allow auto-merge for meld to follow the vim-diff behaviorLin Sun2020-09-171-0/+10
* config.txt: move mergetool.* to a separate fileNguyễn Thái Ngọc Duy2018-10-291-0/+53