summaryrefslogtreecommitdiffstats
path: root/Documentation/merge-strategies.txt (follow)
Commit message (Expand)AuthorAgeFilesLines
* Adding upstream version 1:2.30.2.upstream/1%2.30.2upstreamDaniel Baumann2024-04-271-0/+136
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 09:37:49 +0000