From 5850fd367731bd0406e403e9561447ecfca618c1 Mon Sep 17 00:00:00 2001 From: Eshel Yaron Date: Tue, 4 Mar 2025 21:53:16 +0100 Subject: [PATCH] Update .gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) 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 -- 2.39.5