aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6031-merge-filemode.sh
AgeCommit message (Expand)AuthorFilesLines
2020-08-10Collect merge-related tests to t64xxElijah Newren1-100/+0
2018-10-07t/*: fix ordering of expected/observed argumentsMatthew DeVore1-1/+1
2015-10-26merge: detect delete/modechange conflictJeff King1-0/+23
2015-10-26t6031: generalize for recursive and resolve strategiesJeff King1-0/+77