summaryrefslogtreecommitdiff
path: root/builtin/merge-file.c
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2011-10-24 17:36:11 +1100
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-27 11:27:57 -0700
commit02cb67530e62e77d437cd68b4bb4307ab752b6a0 (patch)
treee082ce131ad482a4ae0351eeb63f8ca41cc96a6a /builtin/merge-file.c
parentget_tree_entry(): do not call find_tree_entry() on an empty tree (diff)
downloadtgif-02cb67530e62e77d437cd68b4bb4307ab752b6a0.tar.xz
read_directory_recursive: reduce one indentation level
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions