summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-11-21 11:03:20 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-21 11:03:20 -0800
commit0f64a5a3a25c9a161c4e70ae031c885a6284ddb8 (patch)
treee89ea6181133513b8022ccc901a494bd12faef7a /t/t6023-merge-file.sh
parentconfig.c: Fix a static buffer overwrite bug by avoiding mkpath() (diff)
parentconvert.c: Fix return type of git_path_check_eol() (diff)
downloadtgif-0f64a5a3a25c9a161c4e70ae031c885a6284ddb8.tar.xz
Merge branch 'rr/misc-fixes'
* rr/misc-fixes: convert.c: Fix return type of git_path_check_eol()
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions