gitattributes: End merge conflicts in Changelog

Similar could be done with other lists that generally are appended to

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

.gitattributes

@@ -1 +1,2 @@
 *.pnm -diff -text
+Changelog    merge=union