Skip to content

Commit

Permalink
remove merge=union attribute for Misc/NEWS
Browse files Browse the repository at this point in the history
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. pythonGH-212)
  • Loading branch information
methane committed Mar 4, 2017
1 parent da62373 commit 0af5892
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Misc/NEWS merge=union

*.pck binary
Lib/test/cjkencodings/* binary
Lib/test/decimaltestdata/*.decTest binary
Expand Down

0 comments on commit 0af5892

Please sign in to comment.