;;; ediff-merg.el --- merging utilities
-;; Copyright (C) 1994-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2015 Free Software Foundation, Inc.
;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
;; Package: ediff
(defvar ediff-merge-window-share)
(defvar ediff-window-config-saved)
-(eval-when-compile
- (require 'ediff-util))
-;; end pacifier
-
(require 'ediff-init)
+(require 'ediff-util)
(defcustom ediff-quit-merge-hook 'ediff-maybe-save-and-delete-merge
"Hooks to run before quitting a merge job.
)
(make-variable-buffer-local 'ediff-skip-merge-regions-that-differ-from-default)
+(defvar state-of-merge) ; dynamic var
+
;; check if there is no clash between the ancestor and one of the variants.
;; if it is not a merge job then return true
(defun ediff-merge-region-is-non-clash (n)
(reverse delim-regs-list)
)))
-(defvar state-of-merge) ; dynamic var
-
;; Check if the non-preferred merge has been modified since originally set.
;; This affects only the regions that are marked as default-A/B or combined.
;; If PREFERS-TOO is non-nil, then look at the regions marked as prefers-A/B as