Please sign in to comment.
Use the NEWS merge driver if available
As described in https://wiki.php.net/vcs/gitworkflow#the_news_file it is possible to setup a custom merge driver for NEWS so git doesnt try to merge it. This commit sets the default merge driver for the NEWS file to the merge driver called NEWS.
- Loading branch information...