(provide 'ediff-merg)
-(defgroup ediff-merge nil
- "Merging utilities"
- :prefix "ediff-"
- :group 'ediff)
-
-
;; compiler pacifier
(defvar ediff-window-A)
(defvar ediff-window-B)
))
(defun ediff-set-merge-mode ()
- ;; by Stig@hackvan.com
(normal-mode t)
(remove-hook 'local-write-file-hooks 'ediff-set-merge-mode))