git-p4: add failing test for P4EDITOR handling
[gitweb.git] / mergetools / gvimdiff2
2013-02-07 Merge branch 'jk/mergetool'
2013-01-29 mergetools: simplify how we handle "vim" and "defaults"