Merge branch 'maint'
[gitweb.git] / t / t6031-merge-filemode.sh
2015-10-30 Merge branch 'js/misc-fixes'
2015-10-30 Merge branch 'js/imap-send-curl-compilation-fix'
2015-10-30 Merge branch 'jk/delete-modechange-conflict'
2015-10-26 merge: detect delete/modechange conflict
2015-10-26 t6031: generalize for recursive and resolve strategies