From 1ef8e28cf8d2f42c9cef3dac8dccb283508ac481 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 11 Dec 2017 13:25:41 -0500 Subject: [PATCH] * admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling. --- admin/gitmerge.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- 2.39.5