Merge branch 'ew/config-protect-mode'
[gitweb.git] / mergetools / vimdiff3
2014-06-03 Merge branch 'ew/config-protect-mode'
2014-06-03 Merge branch 'bg/strbuf-trim'
2014-06-03 Merge branch 'jk/commit-date-approxidate'
2014-06-03 Merge branch 'ep/shell-command-substitution'
2014-06-03 Merge branch 'fc/rerere-conflict-style'
2014-06-03 Merge branch 'dt/api-doc-setup-gently'
2014-06-03 Merge branch 'fc/mergetool-prompt'
2014-06-03 Merge branch 'mm/mediawiki-encoding-fix'
2014-06-03 Merge branch 'sk/tag-contains-wo-recursion'
2014-06-03 Merge branch 'ef/send-email-absolute-path-to-the-command'
2014-06-03 Merge branch 'jx/blame-align-relative-time'
2014-06-03 Merge branch 'lr/git-run-setup-gently'
2014-06-03 Merge branch 'fc/mergetools-vimdiff3'
2014-04-22 mergetools: add vimdiff3 mode