From 8f43d9119e06284acdf70131ccb6b063a57142d5 Mon Sep 17 00:00:00 2001
From: Eshel Yaron <me@eshelyaron.com>
Date: Sun, 26 Jan 2025 20:02:14 +0100
Subject: [PATCH] Tweak .gitattributes

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

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
-- 
2.39.5