t7408: merge short tests, factor out testing method
[git] / builtin / merge-recursive.c
2016-08-04  Junio C HamanoMerge branch 'jc/grep-commandline-vs-configuration'
2016-08-04  Junio C HamanoMerge branch 'sb/submodule-clone-retry'
2016-08-04  Junio C HamanoMerge branch 'sb/pack-protocol-doc-nak'
2016-08-03  Junio C HamanoMerge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'
2016-08-03  Junio C HamanoMerge branch 'rs/submodule-config-code-cleanup'
2016-08-03  Junio C HamanoMerge branch 'jt/fetch-large-handshake-window-on-http'
2016-08-03  Junio C HamanoMerge branch 'jk/git-jump'
2016-08-03  Junio C HamanoMerge branch 'mm/status-suggest-merge-abort'
2016-08-03  Junio C HamanoMerge branch 'jk/parse-options-concat'
2016-08-03  Junio C HamanoMerge branch 'sb/push-options'
2016-08-03  Junio C HamanoMerge branch 'ew/http-walker'
2016-08-03  Junio C HamanoMerge branch 'pm/build-persistent-https-with-recent-go'
2016-08-03  Junio C HamanoMerge branch 'da/subtree-2.9-regression'
2016-08-03  Junio C HamanoMerge branch 'os/no-verify-skips-commit-msg-too'
2016-07-28  Junio C HamanoSync with maint
2016-07-28  Junio C HamanoMerge branch 'master' of git://git.bogomips.org/git-svn
2016-07-28  Junio C HamanoMerge branch 'js/t3404-grammo-fix' into maint
2016-07-28  Junio C HamanoMerge branch 'nd/doc-new-command' into maint
2016-07-28  Junio C HamanoMerge branch 'ew/gc-auto-pack-limit-fix' into maint
2016-07-28  Junio C HamanoMerge branch 'js/color-on-windows-comment' into maint
2016-07-28  Junio C HamanoMerge branch 'js/sign-empty-commit-fix' into maint
2016-07-28  Junio C HamanoMerge branch 'ps/rebase-i-auto-unstash-upon-abort'...
2016-07-28  Junio C HamanoMerge branch 'nd/ita-cleanup' into maint
2016-07-28  Junio C HamanoMerge branch 'js/find-commit-subject-ignore-leading...
2016-07-28  Junio C HamanoMerge branch 'sb/submodule-deinit-all'
2016-07-28  Junio C HamanoMerge branch 'ew/find-perl-on-freebsd-in-local'
2016-07-28  Junio C HamanoMerge branch 'ew/daemon-socket-keepalive'
2016-07-28  Junio C HamanoMerge branch 'nd/pack-ofs-4gb-limit'
2016-07-28  Junio C HamanoMerge branch 'nd/worktree-lock'
2016-07-28  Junio C HamanoMerge branch 'rs/notes-merge-no-toctou'
2016-07-28  Junio C HamanoMerge branch 'js/rebase-i-tests'
2016-07-25  Junio C HamanoMerge branch 'rs/use-strbuf-addbuf'
2016-07-25  Junio C HamanoMerge branch 'ew/autoconf-pthread'
2016-07-25  Junio C HamanoMerge branch 'mh/blame-worktree'
2016-07-25  Junio C HamanoMerge branch 'js/fsck-name-object'
2016-07-25  Junio C HamanoMerge branch 'nd/cache-tree-ita'
2016-07-25  Junio C HamanoMerge branch 'jk/push-scrub-url'
2016-07-25  Junio C HamanoMerge branch 'nd/test-helpers'
2016-07-25  Junio C HamanoMerge branch 'jc/doc-diff-filter-exclude'
2016-07-25  Junio C HamanoMerge branch 'ls/travis-enable-httpd-tests'
2016-07-25  Junio C HamanoMerge branch 'jc/renormalize-merge-kill-safer-crlf'
2016-07-25  Junio C HamanoMerge branch 'rs/worktree-use-strbuf-absolute-path'
2016-07-25  Junio C HamanoMerge branch 'rs/rm-strbuf-optim'
2016-07-25  Junio C HamanoMerge branch 'rw/make-needs-librt'
2016-07-25  Junio C HamanoMerge branch 'js/ignore-space-at-eol'
2016-07-25  Junio C HamanoMerge branch 'mh/ref-iterators'
2016-07-25  Junio C HamanoMerge branch 'mh/update-ref-errors'
2016-07-25  Junio C HamanoMerge branch 'mh/split-under-lock'
2016-07-19  Junio C HamanoMerge branch 'ls/p4-tmp-refs'
2016-07-19  Junio C HamanoMerge branch 'js/am-call-theirs-theirs-in-fallback...
2016-07-19  Junio C HamanoMerge branch 'jk/write-file'
2016-07-19  Junio C HamanoMerge branch 'jk/printf-format'
2016-07-19  Junio C HamanoMerge branch 'rs/help-c-source-with-gitattributes'
2016-07-19  Junio C HamanoMerge branch 'nd/fetch-ref-summary'
2016-07-19  Junio C HamanoMerge branch 'jk/test-match-signal'
2016-07-19  Junio C HamanoMerge branch 'jk/common-main'
2016-07-19  Junio C HamanoMerge branch 'ak/lazy-prereq-mktemp'
2016-07-19  Junio C HamanoMerge branch 'nd/icase'
2016-07-19  Junio C HamanoMerge branch 'bc/cocci'
2016-07-19  Junio C HamanoMerge branch 'lf/recv-sideband-cleanup'
2016-07-13  Junio C HamanoMerge branch 'nd/ita-cleanup'
2016-07-13  Junio C HamanoMerge branch 'ps/rebase-i-auto-unstash-upon-abort'
2016-07-13  Junio C HamanoMerge branch 'js/t3404-grammo-fix'
2016-07-13  Junio C HamanoMerge branch 'js/sign-empty-commit-fix'
2016-07-13  Junio C HamanoMerge branch 'nd/doc-new-command'
2016-07-13  Junio C HamanoMerge branch 'ew/gc-auto-pack-limit-fix'
2016-07-11  Junio C HamanoMerge branch 'cb/t7810-test-label-fix' into maint
2016-07-11  Junio C HamanoMerge branch 'ao/p4-has-branch-prefix-fix' into maint
2016-07-11  Junio C HamanoMerge branch 'ak/t7800-wo-readlink' into maint
2016-07-11  Junio C HamanoMerge branch 'lc/shell-default-value-noexpand' into...
2016-07-11  Junio C HamanoMerge branch 'jk/bisect-show-tree' into maint
2016-07-11  Junio C HamanoMerge branch 'js/color-on-windows-comment'
2016-07-11  Junio C HamanoMerge branch 'js/find-commit-subject-ignore-leading...
2016-07-11  Junio C HamanoMerge branch 'jk/ansi-color'
2016-07-06  Junio C HamanoMerge branch 'ao/p4-has-branch-prefix-fix'
2016-07-06  Junio C HamanoMerge branch 'cb/t7810-test-label-fix'
2016-07-06  Junio C HamanoMerge branch 'ak/t7800-wo-readlink'
2016-07-06  Junio C HamanoMerge branch 'lc/shell-default-value-noexpand'
2016-07-06  Junio C HamanoMerge branch 'jk/bisect-show-tree'
2016-07-06  Junio C HamanoMerge branch 'jc/deref-tag' into maint
2016-07-06  Junio C HamanoMerge branch 'pb/strbuf-read-file-doc' into maint
2016-07-06  Junio C HamanoMerge branch 'jk/fetch-prune-doc' into maint
2016-07-06  Junio C HamanoMerge branch 'mg/cherry-pick-multi-on-unborn' into...
2016-07-06  Junio C HamanoMerge branch 'em/newer-freebsd-shells-are-fine-with...
2016-07-06  Junio C HamanoMerge branch 'nb/gnome-keyring-build' into maint
2016-07-06  Junio C HamanoMerge branch 'jk/avoid-unbounded-alloca' into maint
2016-07-06  Junio C HamanoMerge branch 'vs/prompt-avoid-unset-variable' into...
2016-07-06  Junio C HamanoMerge branch 'dn/gpg-doc' into maint
2016-07-06  Junio C HamanoMerge branch 'ap/git-svn-propset-doc' into maint
2016-06-28  brian m. carlsonmerge-recursive: convert merge_recursive_generic()...
2016-06-27  Junio C HamanoMerge branch 'mg/cherry-pick-multi-on-unborn'
2016-06-27  Junio C HamanoMerge branch 'em/newer-freebsd-shells-are-fine-with...
2016-06-27  Junio C HamanoMerge branch 'nb/gnome-keyring-build'
2016-06-27  Junio C HamanoMerge branch 'jc/deref-tag'
2016-06-27  Junio C HamanoMerge branch 'jk/avoid-unbounded-alloca'
2016-06-27  Junio C HamanoMerge branch 'vs/prompt-avoid-unset-variable'
2016-06-27  Junio C HamanoMerge branch 'pb/strbuf-read-file-doc'
2016-06-27  Junio C HamanoMerge branch 'dn/gpg-doc'
2016-06-27  Junio C HamanoMerge branch 'jk/fetch-prune-doc'
2016-06-27  Junio C HamanoMerge branch 'ap/git-svn-propset-doc'
next