aboutsummaryrefslogtreecommitdiff
path: root/t/t6031-merge-filemode.sh
Commit message (Expand)AuthorAge
* merge: detect delete/modechange conflictJeff King2015-10-26
* t6031: generalize for recursive and resolve strategiesJeff King2015-10-26