summaryrefslogtreecommitdiff
path: root/t/t6031-merge-filemode.sh
Commit message (Expand)AuthorAgeFilesLines
* merge: detect delete/modechange conflictjk/delete-modechange-conflictJeff King2015-10-261-0/+23
* t6031: generalize for recursive and resolve strategiesJeff King2015-10-261-0/+77