summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-08-13 18:14:24 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-13 14:14:43 -0700
commita52b321d2e2c314d305be86c0310b3627c1aa95b (patch)
tree92ee7fb16137eeb4c66a23f73ff06de230ef6c6a /merge-recursive.h
parentpreload-index.c: use the right index instead of the_index (diff)
downloadtgif-a52b321d2e2c314d305be86c0310b3627c1aa95b.tar.xz
ls-files: correct index argument to get_convert_attr_ascii()
write_eolinfo() does take an istate as function argument and it should be used instead of the_index. 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 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions