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

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 922ddef6bbd764f300517c94c8238fe97e6ff803..18da466aaa103e41a3da50ac3d2ee8d0fd92b335 100644 (file)
--- 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))