diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-10-25 22:08:12 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-10-25 22:08:12 -0700 |
| commit | d404bb5beeec6ccfef583dbb9c43e3d043df31cf (patch) | |
| tree | 23167bdd8cd6edc54802bd490b893415a614b58d /admin | |
| parent | 3575dd8e8c7edaa904220e5f59240b91814b5564 (diff) | |
| download | emacs-d404bb5beeec6ccfef583dbb9c43e3d043df31cf.tar.gz | |
; * admin/automerge: Tweak previous NEWS fix
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/automerge | 4 |
1 files changed, 2 insertions, 2 deletions
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 |