aboutsummaryrefslogtreecommitdiffstats
path: root/t/combination-symmetric-merge (follow)
Commit message (Expand)AuthorAgeFilesLines
* Add support for combining --merge and --symmetricHEAD1.3masterMattias Andrée3 hours1-0/+26