summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Torsten Bögershausen <tboegi@web.de>2016-02-05 17:13:23 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-08 10:01:40 -0800
commitbb211b4de83b7cbc93049bc0d73883083a6a8b0b (patch)
treebe4d08aee8be666573a62d8097d04d5fa14dbc72 /mergetools
parentconvert.c: remove unused parameter 'path' (diff)
downloadtgif-bb211b4de83b7cbc93049bc0d73883083a6a8b0b.tar.xz
convert.c: remove input_crlf_action()
Integrate the code of input_crlf_action() into convert_attrs(), so that ca.crlf_action is always valid after calling convert_attrs(). Keep a copy of crlf_action in attr_action, this is needed for get_convert_attr_ascii(). Remove eol_attr from struct conv_attrs, as it is now used temporally. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions