From: Eshel Yaron <me@eshelyaron.com>
Date: Tue, 4 Mar 2025 20:53:16 +0000 (+0100)
Subject: Update .gitattributes
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5850fd367731bd0406e403e9561447ecfca618c1;p=emacs.git

Update .gitattributes
---

diff --git a/.gitattributes b/.gitattributes
index bf823b74875..d20cb920224 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -121,3 +121,4 @@ lib-src/rcs2log diff=shell
 # whitespace.
 java/INSTALL -whitespace
 etc/NEWS merge=ours
+etc/NEWS.30 merge=ours