summaryrefslogtreecommitdiff
path: root/mergetools/vim
Commit message (Expand)AuthorAgeFilesLines
* mergetools: simplify how we handle "vim" and "defaults"David Aguilar2013-01-281-36/+0
* mergetools/vim: remove redundant diff commandDavid Aguilar2013-01-271-10/+2
* mergetool--lib: Refactor tools into separate filesDavid Aguilar2011-08-191-0/+44