aboutsummaryrefslogtreecommitdiffstats
path: root/t/merge-short-option (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add conflcit resultions strategies and interactive mode, and a lot of tests1.1Mattias Andrée3 days1-0/+18