diff options
Diffstat (limited to 'admin/automerge')
| -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 |