diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..30567178e --- /dev/null +++ b/.gitattributes @@ -0,0 +1,7 @@ +# Using merge=union should make it easier to maintain changelogs across +# branches, by using the text from both sides for the merge. +# +doc/doc-txt/NewStuff merge=union +doc/doc-txt/ChangeLog merge=union +doc/doc-txt/OptionLists.txt merge=union +src/README.UPDATING merge=union |