summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-12-15 12:24:32 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-12-15 12:24:32 +0900
commit6be6e6629fe9da1bfef904d2615536ad0db14e1d (patch)
tree8e54bcc08f3f73f4b98343b3793b89ee2392caed /builtin/merge-file.c
parentMerge branch 'js/mailinfo-format-flowed-fix' into maint (diff)
parentt9902: 'send-email' test case requires PERL (diff)
downloadtgif-6be6e6629fe9da1bfef904d2615536ad0db14e1d.tar.xz
Merge branch 'js/t9902-send-email-completion-fix' into maint
* js/t9902-send-email-completion-fix: t9902: 'send-email' test case requires PERL
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions