From: softworkz <softwo...@hotmail.com> ..when checked out with autocrlf=on, which is Git default on Windows.
Signed-off-by: softworkz <softwo...@hotmail.com> --- .gitattributes | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index b64bbed2eb..eaf7f7f9a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,38 @@ *.pnm -diff -text -Changelog merge=union +Changelog merge=union +tests/ref/fate/sub-aqtitle eol=lf +tests/ref/fate/sub-ass-to-ass-transcode eol=lf +tests/ref/fate/sub-cc eol=lf +tests/ref/fate/sub-cc-realtime +tests/ref/fate/sub-cc-realtime eol=lf +tests/ref/fate/sub-cc-scte20 eol=lf +tests/ref/fate/sub-charenc eol=lf +tests/ref/fate/sub-dvb eol=lf +tests/ref/fate/sub-jacosub eol=lf +tests/ref/fate/sub-lrc-remux eol=lf +tests/ref/fate/sub-microdvd eol=lf +tests/ref/fate/sub-microdvd-remux eol=lf +tests/ref/fate/sub-movtext eol=lf +tests/ref/fate/sub-mpl2 eol=lf +tests/ref/fate/sub-mpsub eol=lf +tests/ref/fate/sub-mpsub-frames eol=lf +tests/ref/fate/sub-pgs-remux eol=lf +tests/ref/fate/sub-pjs eol=lf +tests/ref/fate/sub-realtext eol=lf +tests/ref/fate/sub-sami eol=lf +tests/ref/fate/sub-sami2 eol=lf +tests/ref/fate/sub-scc-remux eol=lf +tests/ref/fate/sub-srt eol=lf +tests/ref/fate/sub-srt-badsyntax eol=lf +tests/ref/fate/sub-srt-empty-events eol=lf +tests/ref/fate/sub-srt-madness-timeshift eol=lf +tests/ref/fate/sub-srt-rrn-remux eol=lf +tests/ref/fate/sub-ssa-to-ass-remux eol=lf +tests/ref/fate/sub-stl eol=lf +tests/ref/fate/sub-subviewer eol=lf +tests/ref/fate/sub-subviewer1 eol=lf +tests/ref/fate/sub-ttmlenc eol=lf +tests/ref/fate/sub-vplayer eol=lf +tests/ref/fate/sub-webvtt eol=lf +tests/ref/fate/sub-webvtt2 eol=lf +tests/ref/fate/sub-webvttenc eol=lf -- ffmpeg-codebot _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
