Merge branch 'mt/p4-depotFile-at-version'
[gitweb.git] / mergetools / winmerge
2015-06-11 Merge branch 'mt/p4-depotFile-at-version'
2015-06-11 Merge branch 'mh/verify-lock-error-report'
2015-06-11 Merge branch 'jk/color-diff-plain-is-context'
2015-06-11 Merge branch 'jk/clone-dissociate'
2015-06-11 Merge branch 'jc/diff-ws-error-highlight'
2015-06-05 Sync with 2.4.3
2015-06-05 Merge branch 'ld/p4-editor-multi-words'
2015-06-05 Merge branch 'bc/object-id'
2015-06-05 Merge branch 'jk/at-push-sha1'
2015-06-01 Merge branch 'sb/test-bitmap-free-at-end'
2015-06-01 Merge branch 'mm/rebase-i-post-rewrite-exec'
2015-06-01 Merge branch 'fm/fetch-raw-sha1'
2015-06-01 Merge branch 'sg/help-group'
2015-06-01 Merge branch 'mm/log-format-raw-doc'
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