Merge branch 'fc/rerere-conflict-style'
[git] / mergetools / gvimdiff3
2014-06-03  Junio C HamanoMerge branch 'fc/rerere-conflict-style'
2014-06-03  Junio C HamanoMerge branch 'dt/api-doc-setup-gently'
2014-06-03  Junio C HamanoMerge branch 'fc/mergetool-prompt'
2014-06-03  Junio C HamanoMerge branch 'mm/mediawiki-encoding-fix'
2014-06-03  Junio C HamanoMerge branch 'sk/tag-contains-wo-recursion'
2014-06-03  Junio C HamanoMerge branch 'ef/send-email-absolute-path-to-the-command'
2014-06-03  Junio C HamanoMerge branch 'jx/blame-align-relative-time'
2014-06-03  Junio C HamanoMerge branch 'lr/git-run-setup-gently'
2014-06-03  Junio C HamanoMerge branch 'fc/mergetools-vimdiff3'
2014-04-22  Felipe Contrerasmergetools: add vimdiff3 mode