Merge branch 'nd/status-show-in-progress'
[gitweb.git] / mergetools / gvimdiff2
2013-02-14 Merge branch 'nd/status-show-in-progress'
2013-02-14 Merge branch 'bw/get-tz-offset-perl'
2013-02-14 Merge branch 'al/mergetool-printf-fix'
2013-02-14 Merge branch 'jk/error-const-return'
2013-02-14 Merge branch 'jx/utf8-printf-width'
2013-02-14 Merge branch 'mg/bisect-doc'
2013-02-14 Merge branch 'tz/perl-styles'
2013-02-14 Merge branch 'jc/extended-fake-ancestor-for-gitlink'
2013-02-14 Merge branch 'dg/subtree-fixes'
2013-02-12 Merge branch 'maint'
2013-02-11 Merge branch 'maint'
2013-02-11 Merge branch 'sp/smart-http-content-type-check'
2013-02-09 Merge branch 'master' of git://github.com/git-l10n...
2013-02-08 Merge branch 'jc/combine-diff-many-parents'
2013-02-08 Merge branch 'jk/apply-similaritly-parsing'
2013-02-08 Merge branch 'mk/tcsh-complete-only-known-paths'
2013-02-08 Merge branch 'mp/complete-paths'
2013-02-08 Merge branch 'ct/autoconf-htmldir'
2013-02-07 Sync with 1.8.1.3
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"