aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
blob: b64bbed2eb45b2a825f0e68ff3a3a46942039bb0 (plain) (blame)
1
2
*.pnm -diff -text
Changelog    merge=union