[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 55806ee: * admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS
From: |
Glenn Morris |
Subject: |
master 55806ee: * admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts. |
Date: |
Wed, 29 Jul 2020 18:15:38 -0400 (EDT) |
branch: master
commit 55806ee46b047c03698340ce8a6397de6355c56a
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>
* 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 922ddef..18da466 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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 55806ee: * admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.,
Glenn Morris <=