[Emacs-diffs] master d404bb5: ; * admin/automerge: Tweak previous NEWS fix

[Glenn Morris]

branch: master
commit d404bb5beeec6ccfef583dbb9c43e3d043df31cf
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    ; * admin/automerge: Tweak previous NEWS fix
---
 admin/automerge | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/automerge b/admin/automerge
index b320369..8bf9817 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