summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-07-22 13:05:56 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-22 13:05:56 -0700
commit33309e428bf85a0f06e4d23b448bf5400efe3f17 (patch)
treecf149032b3357104ad7560f637a6cc3ccb771cc5 /builtin/merge-recursive.c
parentMerge branch 'ab/gitignore-discovery-doc' (diff)
parentimap-send.c: use less verbose strbuf_fread() idiom (diff)
downloadtgif-33309e428bf85a0f06e4d23b448bf5400efe3f17.tar.xz
Merge branch 'ab/imap-send-read-everything-simplify'
Code simplification. * ab/imap-send-read-everything-simplify: imap-send.c: use less verbose strbuf_fread() idiom
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions