[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 1ef8e28: * admin/gitmerge.el (gitmerge-resolve): Di
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 1ef8e28: * admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling. |
Date: |
Mon, 11 Dec 2017 13:33:48 -0500 (EST) |
branch: master
commit 1ef8e28cf8d2f42c9cef3dac8dccb283508ac481
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
* 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 69f48b8..eddc72e 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 1ef8e28: * admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.,
Glenn Morris <=