Merge branch 'fc/mergetools-vimdiff3'
* fc/mergetools-vimdiff3: mergetools: add vimdiff3 mode
Junio C Hamano committed
Jun 3, 2014 at 12:06 UTC
3a9dae783bb66c18409d42d07949456dde8c4c62
No changes.
* fc/mergetools-vimdiff3: mergetools: add vimdiff3 mode
No changes.