Merge branch 'js/mingw-tests'
[gitweb.git] / t / t6031-merge-filemode.sh
2015-10-26 merge: detect delete/modechange conflict
2015-10-26 t6031: generalize for recursive and resolve strategies