Merge branch 'ss/mergetools-tortoise'
[gitweb.git] / mergetools / vimdiff2
2013-02-07 Merge branch 'ss/mergetools-tortoise'
2013-02-07 Merge branch 'jk/mergetool'
2013-01-29 mergetools: simplify how we handle "vim" and "defaults"