From: Glenn Morris <rgm@gnu.org>
Date: Sat, 2 Dec 2017 03:00:02 +0000 (-0500)
Subject: * admin/gitmerge.el (gitmerge-resolve):
X-Git-Tag: emacs-27.0.90~6107
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=52097314c1a160be622dfcf9f40c33190a90be88;p=emacs.git

* admin/gitmerge.el (gitmerge-resolve):
Fix treatment of generated files.
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index b9b511fbee2..e9e033517d0 100644
--- 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))