summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff3
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-12-21 14:55:03 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-12-21 14:55:03 -0800
commitca21186b3347e1a194c92622a7fb0e16f2480471 (patch)
treee6df6a0f85f1ad9c048bbe3ac2dd3b106a01fc39 /mergetools/vimdiff3
parentMerge branch 'jk/index-pack-wo-repo-from-stdin' (diff)
parentmailinfo.c: move side-effects outside of assert (diff)
downloadtgif-ca21186b3347e1a194c92622a7fb0e16f2480471.tar.xz
Merge branch 'jt/mailinfo-fold-in-body-headers'
Fix for NDEBUG builds. * jt/mailinfo-fold-in-body-headers: mailinfo.c: move side-effects outside of assert
Diffstat (limited to 'mergetools/vimdiff3')
0 files changed, 0 insertions, 0 deletions