From: Glenn Morris <rgm@gnu.org>
Date: Mon, 11 Dec 2017 18:25:41 +0000 (-0500)
Subject: * admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.
X-Git-Tag: emacs-27.0.90~6051
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1ef8e28cf8d2f42c9cef3dac8dccb283508ac481;p=emacs.git

* admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.
---

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 69f48b877af..eddc72e679c 100644
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -316,7 +316,11 @@ Returns non-nil if conflicts remain."
                                    (gitmerge-emacs-version gitmerge--from))))
                    (file-exists-p temp)
                    (or noninteractive
-                       (y-or-n-p "Try to fix NEWS conflict? ")))
+                       (and
+                        (y-or-n-p "Try to fix NEWS conflict? ")
+                        ;; FIXME
+                        (y-or-n-p "This is buggy, really try? ")
+                        )))
               (let ((relfile (file-name-nondirectory file))
                     (tempfile (make-temp-file "gitmerge")))
                 (unwind-protect