summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-09-11 10:53:29 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-12 13:46:58 -0700
commite22148f406a7a31a25ebda01d21d9a4646ce82ea (patch)
tree3951e232cdbdc52e45e2bdca4af2242254ade2ba /builtin/merge.c
parentcompat/nedmalloc: don't force NDEBUG on the rest of git (diff)
downloadtgif-e22148f406a7a31a25ebda01d21d9a4646ce82ea.tar.xz
t3101: modernise style
Also add a few " &&" cascade that were missing. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions