Age | Commit message (Expand) | Author |
---|---|---|
2021-03-14 | mergetool: do not enable hideResolved by default | Jonathan Nieder |
2021-02-10 | mergetool: add per-tool support and overrides for the hideResolved flag | Seth House |
2021-02-10 | mergetool: add hideResolved configuration | Seth House |
2020-09-17 | mergetool: allow auto-merge for meld to follow the vim-diff behavior | Lin Sun |
2018-10-29 | config.txt: move mergetool.* to a separate file | Nguyễn Thái Ngọc Duy |