aboutsummaryrefslogtreecommitdiffstats
path: root/t/invalid-option-combinations (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add --symmetricHEAD1.2masterMattias Andrée20 hours1-0/+49
* Add conflcit resultions strategies and interactive mode, and a lot of tests1.1Mattias Andrée3 days1-0/+20