Commit 060d2d77 authored by INADA Naoki's avatar INADA Naoki Committed by GitHub
Browse files

remove merge=union attribute for Misc/NEWS (GH-460) 

Github doesn't support it (ref. isaacs/github#487).  So it can't ease
conflict on Github.

Additionally, it can make trouble when cherry-pick. (ref. GH-212)
parent 6abaed0d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment