summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
AgeCommit message (Expand)Author
2014-04-22mergetools: add vimdiff3 modeFelipe Contreras
2013-01-29mergetools: simplify how we handle "vim" and "defaults"David Aguilar