Merge branch 'mg/doc-status-color-slot' into maint
[gitweb.git] / mergetools / gvimdiff
2013-01-29 mergetools: simplify how we handle "vim" and "defaults"