summaryrefslogtreecommitdiff
path: root/Documentation/mergetools
AgeCommit message (Expand)Author
2025-08-11doc: check well-formedness of delimited sectionsJean-Noël Avila
2025-05-27doc: convert git-mergetool options to new synopsis styleJean-Noël Avila
2025-04-08Merge branch 'dk/vimdiff-doc-fix'Junio C Hamano
2025-03-25vimdiff: clarify the sigil used for marking the buffer to saveD. Ben Knoble
2025-01-21doc: use .adoc extension for AsciiDoc filesbrian m. carlson
2024-02-19mergetools: vimdiff: use correct tool's name when reading mergetool configKipras Melnikovas
2023-10-09documentation: fix singular vs. pluralElijah Newren
2023-10-09documentation: wording improvementsElijah Newren
2022-04-03vimdiff: add tool documentationFernando Ramos