summaryrefslogtreecommitdiff
path: root/t/t6031-merge-filemode.sh
AgeCommit message (Expand)AuthorFilesLines
2015-10-26merge: detect delete/modechange conflictLibravatar Jeff King1-0/+23
2015-10-26t6031: generalize for recursive and resolve strategiesLibravatar Jeff King1-0/+77