aboutsummaryrefslogtreecommitdiffstats
path: root/t/symmetric-multiple-conflicts (unfollow)
Commit message (Expand)AuthorFilesLines
10 hoursAdd --symmetricHEAD1.2masterMattias Andrée1-9/+17
3 daysAdd conflcit resultions strategies and interactive mode, and a lot of tests1.1Mattias Andrée1-0/+34