Merge branch 'fc/mergetools-vimdiff3'
[gitweb.git] / mergetools / gvimdiff3
2014-06-03 Merge branch 'fc/mergetools-vimdiff3'
2014-04-22 mergetools: add vimdiff3 mode