| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'nb/doc-mergetool-typofix' into maint-2.38 | Junio C Hamano | 2022-10-26 | 1 | -1/+1 |
| |\ | |||||
| | * | mergetool.txt: typofix 'overwriten' -> 'overwritten' | Noah Betzen | 2022-10-05 | 1 | -1/+1 |
| * | | vimdiff: add tool documentation | Fernando Ramos | 2022-04-04 | 1 | -0/+9 |
| |/ | |||||
| * | mergetool: do not enable hideResolved by default | Jonathan Nieder | 2021-03-14 | 1 | -1/+1 |
| * | mergetool: add per-tool support and overrides for the hideResolved flag | Seth House | 2021-02-09 | 1 | -0/+5 |
| * | mergetool: add hideResolved configuration | Seth House | 2021-02-09 | 1 | -0/+10 |
| * | mergetool: allow auto-merge for meld to follow the vim-diff behavior | Lin Sun | 2020-09-17 | 1 | -0/+10 |
| * | config.txt: move mergetool.* to a separate file | Nguyễn Thái Ngọc Duy | 2018-10-29 | 1 | -0/+53 |
 |
index : git | |
| git | Fast-forward packages |
| summaryrefslogtreecommitdiffstats |