Merge branch 'md/url-parse-harden' into maint
[gitweb.git] / mergetools / smerge
2019-04-25 Merge branch 'ab/test-lib-pass-trace2-env'
2019-04-25 Merge branch 'sg/index-pack-progress'
2019-04-25 Merge branch 'ab/commit-graph-fixes'
2019-04-25 Merge branch 'ab/gc-reflog'
2019-04-25 Merge branch 'nd/checkout-m'
2019-04-25 Merge branch 'js/difftool-no-index'
2019-04-25 Merge branch 'pw/cherry-pick-continue'
2019-04-25 Merge branch 'nd/commit-a-with-paths-msg-update'
2019-04-25 Merge branch 'jk/server-info-rabbit-hole'
2019-04-25 Merge branch 'nd/diff-parseopt-4'
2019-04-25 Merge branch 'jk/unused-params-even-more'
2019-04-25 Merge branch 'sg/test-atexit'
2019-04-25 Merge branch 'ag/sequencer-reduce-rewriting-todo'
2019-04-25 Merge branch 'bp/post-index-change-hook'
2019-04-22 Merge branch 'da/smerge'
2019-04-04 mergetools: add support for smerge (Sublime Merge)