procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2020-07-29 15:15:15 -07:00
parent 653a81bf8c
commit 55806ee46b
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
admin/gitmerge.el
View file

@ -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))