aboutsummaryrefslogtreecommitdiffstats
path: root/t/symmetric-multiple-conflicts (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Add --symmetric1.2Mattias Andrée23 hours1-0/+42
Signed-off-by: Mattias Andrée <m@maandree.se>