summaryrefslogtreecommitdiffstats
path: root/t/t6031-merge-filemode.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t/*: fix ordering of expected/observed argumentsMatthew DeVore2018-10-071-1/+1
* merge: detect delete/modechange conflictJeff King2015-10-261-0/+23
* t6031: generalize for recursive and resolve strategiesJeff King2015-10-261-0/+77