From: Glenn Morris <rgm@gnu.org>
Date: Fri, 26 Oct 2018 05:08:12 +0000 (-0700)
Subject: ; * admin/automerge: Tweak previous NEWS fix
X-Git-Tag: emacs-27.0.90~4253
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d404bb5beeec6ccfef583dbb9c43e3d043df31cf;p=emacs.git

; * admin/automerge: Tweak previous NEWS fix
---

diff --git a/admin/automerge b/admin/automerge
index b320369d174..8bf981744b7 100755
--- a/admin/automerge
+++ b/admin/automerge
@@ -176,8 +176,8 @@ merge
 
 ## FIXME it would be better to trap this in gitmerge.
 ## NEWS should never be modified, only eg NEWS.26.
-git diff --stat --cached origin/master | grep -q "NEWS " && \
-    die "NEWS has been modified"
+git diff --stat --cached origin/master | grep -q "etc/NEWS " && \
+    die "etc/NEWS has been modified"
 
 
 [ "$build" ] || exit 0