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