From 55806ee46b047c03698340ce8a6397de6355c56a Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 29 Jul 2020 15:15:15 -0700 Subject: [PATCH] * admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts. --- admin/gitmerge.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)) -- 2.39.2