diff options
| author | Glenn Morris <rgm@gnu.org> | 2020-07-29 15:15:15 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2020-07-29 15:15:15 -0700 |
| commit | 55806ee46b047c03698340ce8a6397de6355c56a (patch) | |
| tree | 1b7a8d72934bf7ba5ad4b74bd173684f67511243 /admin | |
| parent | 653a81bf8ce41725d12b20f6de3d1877d190f269 (diff) | |
| download | emacs-55806ee46b047c03698340ce8a6397de6355c56a.tar.gz | |
* admin/gitmerge.el (gitmerge-resolve): Discard AUTHORS conflicts.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/gitmerge.el | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |