Reduce conflict on Misc/NEWS (GH-212)

use "union" merge strategy for Misc/NEWS.

Reduce conflict on Misc/NEWS (GH-212)
use "union" merge strategy for Misc/NEWS.
3f3d0364 · INADA Naoki · GitHub · 32e8f9bd · 3f3d0364
Commit 3f3d0364 authored Feb 21, 2017 by INADA Naoki Committed by GitHub Feb 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

.gitattribute .gitattribute +1 -0

No files found.
--- a/.gitattribute
+++ b/.gitattribute
+Misc/NEWS   merge=union