Merge branch 'dt/cat-file-follow-symlinks'
[gitweb.git] / mergetools / winmerge
2015-06-01 Merge branch 'dt/cat-file-follow-symlinks'
2015-06-01 Merge branch 'rs/janitorial'
2015-06-01 Merge branch 'jk/stash-options'
2015-06-01 Merge branch 'da/mergetool-winmerge'
2015-05-20 mergetools: add winmerge as a builtin tool