mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-05 11:45:45 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Glenn Morris 2017-12-11 13:25:41 -05:00
parent 786907238b
commit 1ef8e28cf8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/gitmerge.el
View File

@ -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