浏览代码

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>
Michael Niedermayer 8 月之前
父节点
当前提交
efdf7512a5
共有 1 个文件被更改,包括 1 次插入0 次删除
  1. 1 0
      .gitattributes

+ 1 - 0
.gitattributes

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