| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2021-03-13 | mergetool: do not enable hideResolved by default |  Jonathan Nieder | 1 | -1/+1 |
| 2021-02-09 | mergetool: add per-tool support and overrides for the hideResolved flag |  Seth House | 1 | -0/+5 |
| 2021-02-09 | mergetool: add hideResolved configuration | Seth House | 1 | -0/+10 |
| 2020-09-16 | mergetool: allow auto-merge for meld to follow the vim-diff behavior |  Lin Sun | 1 | -0/+10 |
| 2018-10-29 | config.txt: move mergetool.* to a separate file |  Nguyễn Thái Ngọc Duy | 1 | -0/+53 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |