summaryrefslogtreecommitdiff
path: root/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-05-19 16:45:34 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-19 16:45:34 +0900
commit7a09f5f1b6b506e31d2f8e10ec09a7d2977317aa (patch)
treeccb1c224395a69f6365d735b8227ad3966993d09 /merge.c
parentMerge branch 'ab/sha1dc' (diff)
parentparse-options: adjust `parse_opt_unknown_cb()`s declared return type (diff)
downloadtgif-7a09f5f1b6b506e31d2f8e10ec09a7d2977317aa.tar.xz
Merge branch 'js/parseopt-unknown-cb-returns-an-enum'
Code clean-up. * js/parseopt-unknown-cb-returns-an-enum: parse-options: adjust `parse_opt_unknown_cb()`s declared return type
Diffstat (limited to 'merge.c')
0 files changed, 0 insertions, 0 deletions