summaryrefslogtreecommitdiffstats
path: root/vendor/varisat/src/analyze_conflict.rs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merging upstream version 1.71.1+dfsg1.Daniel Baumann2024-05-181-0/+368
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 12:48:28 +0000