summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:30 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-10-12 13:51:30 -0700
commitd46f95a2bd265b195e6a9e88896d200b6b3a203f (patch)
tree5b57e9cbec7881eb49fe18f057264b5e3906cff8 /builtin/merge.c
parentMerge branch 'ab/mailmap-leakfix' into maint (diff)
parentremote: avoid -Wunused-but-set-variable in gcc with -DNDEBUG (diff)
downloadtgif-d46f95a2bd265b195e6a9e88896d200b6b3a203f.tar.xz
Merge branch 'cb/remote-ndebug-fix' into maint
Build fix. * cb/remote-ndebug-fix: remote: avoid -Wunused-but-set-variable in gcc with -DNDEBUG
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions