Merge branch 'jk/mergetool'
[git] / mergetools / vimdiff
2013-02-07  Junio C HamanoMerge branch 'jk/mergetool'
2013-01-29  David Aguilarmergetools: simplify how we handle "vim" and "defaults"