diff options
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 8947e726a2..06b553db80 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ +ChangeLog merge=merge-changelog timezone/* -whitespace |