Merge branch 'es/osx-header-pollutes-mask-macro'
[git] / mergetools / winmerge
2015-06-24  Junio C HamanoMerge branch 'es/osx-header-pollutes-mask-macro'
2015-06-24  Junio C HamanoMerge branch 'es/configure-getdelim'
2015-06-24  Junio C HamanoMerge branch 'qn/blame-show-email'
2015-06-24  Junio C HamanoMerge branch 'jc/do-not-feed-tags-to-clear-commit-marks'
2015-06-24  Junio C HamanoMerge branch 'es/send-email-sendmail-alias'
2015-06-24  Junio C HamanoMerge branch 'jc/apply-reject-noop-hunk'
2015-06-16  Junio C HamanoSync with 2.4.4
2015-06-16  Junio C HamanoMerge branch 'nd/slim-index-pack-memory-usage'
2015-06-16  Junio C HamanoMerge branch 'sb/pack-protocol-mention-smart-http'
2015-06-16  Junio C HamanoMerge branch 'jk/make-fix-dependencies'
2015-06-16  Junio C HamanoMerge branch 'jk/die-on-bogus-worktree-late'
2015-06-16  Junio C HamanoMerge branch 'sg/merge-summary-config'
2015-06-16  Junio C HamanoMerge branch 'ah/send-email-sendmail-alias'
2015-06-11  Junio C HamanoMerge branch 'tb/complete-sequencing'
2015-06-11  Junio C HamanoMerge branch 'jk/squelch-missing-link-warning-for-unrea...
2015-06-11  Junio C HamanoMerge branch 'pt/pull-tests'
2015-06-11  Junio C HamanoMerge branch 'sb/glossary-submodule'
2015-06-11  Junio C HamanoMerge branch 'sb/submodule-doc-intro'
2015-06-11  Junio C HamanoMerge branch 'jk/diagnose-config-mmap-failure'
2015-06-11  Junio C HamanoMerge branch 'mt/p4-depotFile-at-version'
2015-06-11  Junio C HamanoMerge branch 'mh/verify-lock-error-report'
2015-06-11  Junio C HamanoMerge branch 'jk/color-diff-plain-is-context'
2015-06-11  Junio C HamanoMerge branch 'jk/clone-dissociate'
2015-06-11  Junio C HamanoMerge branch 'jc/diff-ws-error-highlight'
2015-06-05  Junio C HamanoSync with 2.4.3
2015-06-05  Junio C HamanoMerge branch 'ld/p4-editor-multi-words'
2015-06-05  Junio C HamanoMerge branch 'bc/object-id'
2015-06-05  Junio C HamanoMerge branch 'jk/at-push-sha1'
2015-06-02  Junio C HamanoMerge branch 'pt/pull-tests' into pt/pull-optparse
2015-06-01  Junio C HamanoMerge branch 'sb/test-bitmap-free-at-end'
2015-06-01  Junio C HamanoMerge branch 'mm/rebase-i-post-rewrite-exec'
2015-06-01  Junio C HamanoMerge branch 'fm/fetch-raw-sha1'
2015-06-01  Junio C HamanoMerge branch 'sg/help-group'
2015-06-01  Junio C HamanoMerge branch 'mm/log-format-raw-doc'
2015-06-01  Junio C HamanoMerge branch 'dt/cat-file-follow-symlinks'
2015-06-01  Junio C HamanoMerge branch 'rs/janitorial'
2015-06-01  Junio C HamanoMerge branch 'jk/stash-options'
2015-06-01  Junio C HamanoMerge branch 'da/mergetool-winmerge'
2015-05-20  David Aguilarmergetools: add winmerge as a builtin tool