From: Glenn Morris <rgm@gnu.org>
Date: Wed, 29 Jul 2020 22:15:15 +0000 (-0700)
Subject: * admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.
X-Git-Tag: emacs-28.0.90~6898
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=55806ee46b047c03698340ce8a6397de6355c56a;p=emacs.git

* admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 922ddef6bbd..18da466aaa1 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -354,7 +354,7 @@ Returns non-nil if conflicts remain."
                   ;; The conflict markers remain so we return non-nil.
                   (message "Failed to fix NEWS conflict"))))
              ;; Generated files.
-             ((member file '("lisp/ldefs-boot.el"))
+             ((member file '("lisp/ldefs-boot.el" "etc/AUTHORS"))
               ;; We are in the file's buffer, so names are relative.
               (call-process "git" nil t nil "reset" "--"
                             (file-name-nondirectory file))