summaryrefslogtreecommitdiff
path: root/t/t4013/diff.log_--root_-p_master
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-10-21 07:34:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-10-21 07:34:33 -0700
commitc8516500b1ee6025466a207cd86dc30421c3b6e6 (patch)
treec8e68de59db69a4748811504f42b4ce9d0bbcb97 /t/t4013/diff.log_--root_-p_master
parentmerge-recursive: Remove redundant path clearing for D/F conflicts (diff)
downloadtgif-c8516500b1ee6025466a207cd86dc30421c3b6e6.tar.xz
merge-recursive:make_room_for_directories - work around dumb compilers
Some vintage of gcc does not seem to notice last_len is only used when last_file is already set to non-NULL at which point last_len is also set. Noticed on FreeBSD 8 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.log_--root_-p_master')
0 files changed, 0 insertions, 0 deletions