diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-12-11 13:25:41 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-12-11 13:25:41 -0500 |
| commit | 1ef8e28cf8d2f42c9cef3dac8dccb283508ac481 (patch) | |
| tree | ff39a65784d3d9f8c353651a860b69a7d5b18d92 /admin/gitmerge.el | |
| parent | 786907238bcb86ab9e0e2e9ebcc91c52a6eb024c (diff) | |
| download | emacs-1ef8e28cf8d2f42c9cef3dac8dccb283508ac481.tar.gz emacs-1ef8e28cf8d2f42c9cef3dac8dccb283508ac481.tar.bz2 emacs-1ef8e28cf8d2f42c9cef3dac8dccb283508ac481.zip | |
* admin/gitmerge.el (gitmerge-resolve): Disable buggy NEWS handling.
Diffstat (limited to 'admin/gitmerge.el')
| -rw-r--r-- | admin/gitmerge.el | 6 |
1 files changed, 5 insertions, 1 deletions
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 |