* admin/gitmerge.el (gitmerge-resolve):

Fix treatment of generated files.

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index b9b511fbee211bb21c9ab8f0fc643449734c66fd..e9e033517d02eca84811f1b90c2c8e6a22a5c9d5 100644 (file)
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -292,9 +292,11 @@ Returns non-nil if conflicts remain."
             ))
           ;; Try to resolve the conflicts.
           (cond
-           ((member file '("configure" "lisp/ldefs-boot.el"
-                           "lisp/emacs-lisp/cl-loaddefs.el"))
+           ;; Generated files.
+           ((member file '("lisp/ldefs-boot.el"))
             ;; We are in the file's buffer, so names are relative.
+            (call-process "git" nil t nil "reset" "--"
+                          (file-name-nondirectory file))
             (call-process "git" nil t nil "checkout" "--"
                           (file-name-nondirectory file))
             (revert-buffer nil 'noconfirm))