aboutsummaryrefslogtreecommitdiffstats
path: root/t/symmetric-multiple-conflicts (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add --symmetricHEAD1.2masterMattias Andrée15 hours1-0/+42