Merge commit '195942ed9b9b563ec86d34b73aa2c1ee8715d59d'
[ffmpeg.git] / .gitattributes
1 *.pnm -diff -text