From: Eshel Yaron <me@eshelyaron.com>
Date: Sun, 26 Jan 2025 19:02:14 +0000 (+0100)
Subject: Tweak .gitattributes
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8f43d9119e06284acdf70131ccb6b063a57142d5;p=emacs.git

Tweak .gitattributes
---

diff --git a/.gitattributes b/.gitattributes
index 5c0a591385f..bf823b74875 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -120,3 +120,4 @@ lib-src/rcs2log diff=shell
 # This file contains in-line diffs, which can include trailing
 # whitespace.
 java/INSTALL -whitespace
+etc/NEWS merge=ours