aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.adoc
AgeCommit message (Expand)Author
2026-02-07merge-file: honor merge.conflictStyle outside of a repositoryYannik Tausch
2025-01-21doc: use .adoc extension for AsciiDoc filesbrian m. carlson