summaryrefslogtreecommitdiff
path: root/t/t6031-merge-filemode.sh
AgeCommit message (Expand)Author
2018-10-06t/*: fix ordering of expected/observed argumentsMatthew DeVore
2015-10-26merge: detect delete/modechange conflictJeff King
2015-10-26t6031: generalize for recursive and resolve strategiesJeff King