[Emacs-diffs] master 5209731 1/3: * admin/gitmerge.el (gitmerge-resolve):

[Glenn Morris]

branch: master
commit 52097314c1a160be622dfcf9f40c33190a90be88
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    * admin/gitmerge.el (gitmerge-resolve):
    Fix treatment of generated files.
---
 admin/gitmerge.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index b9b511f..e9e0335 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))