summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-03-21 23:09:21 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-03-21 23:09:21 -0700
commit923cc82c481a99269d397dc86f8b664ba8cb98da (patch)
tree4fbd4c8d180bf95f21722aa77de0e4f350cefe26 /builtin-merge-recursive.c
parentMerge branch 'mg/maint-submodule-normalize-path' into maint (diff)
parentsend-email: test --no-thread --in-reply-to combination (diff)
downloadtgif-923cc82c481a99269d397dc86f8b664ba8cb98da.tar.xz
Merge branch 'tr/maint-1.6.0-send-email-irt' into maint
* tr/maint-1.6.0-send-email-irt: send-email: test --no-thread --in-reply-to combination send-email: respect in-reply-to regardless of threading Conflicts: t/t9001-send-email.sh
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions