aboutsummaryrefslogtreecommitdiffstats
path: root/t/unclosed-conflict-head-parent (unfollow)
Commit message (Expand)AuthorFilesLines
3 daysAdd conflcit resultions strategies and interactive mode, and a lot of tests1.1Mattias Andrée1-0/+14