Commit 55806ee4 authored by Glenn Morris's avatar Glenn Morris

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

parent 653a81bf
Pipeline #6169 failed with stage
in 11 seconds
......@@ -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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment