summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar René Scharfe <rene.scharfe@lsrfire.ath.cx>2010-09-11 11:59:18 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-11 10:23:03 -0700
commitd555ff54820ade336d0d0f3900d62d5c09c0f63e (patch)
tree8022789d6530d3a8ba10318c867b56dcfebe941e /builtin/merge.c
parentconfig.txt: fix placement of diff.noprefix (diff)
downloadtgif-d555ff54820ade336d0d0f3900d62d5c09c0f63e.tar.xz
compat/nedmalloc: don't force NDEBUG on the rest of git
Define the nedmalloc feature configuration macros for nedmalloc.o, only. This keeps assert(3) working for the rest of the git source; it was turned off for nedmalloc users before by defining NDEBUG globally. Also remove -DUSE_NED_ALLOCATOR as this macro isn't used anywhere. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions