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

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 69f48b877af9f3255a0d1e921701fb03be5911fa..eddc72e679c35874e931e2f49aca81c4a873d9ab 100644 (file)
--- 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