diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-11-01 01:46:51 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-11-01 01:46:51 +0000 |
| commit | c7f0db1d9568574c957ad7ac4d9946e3c0d02d9b (patch) | |
| tree | 41fb9ebabdd58c293bc42a74eb8d7ffb911e6c40 /lisp/ediff-merg.el | |
| parent | b7a109a26b62625acdfb1fa2fb218eafd4828ecc (diff) | |
| download | emacs-c7f0db1d9568574c957ad7ac4d9946e3c0d02d9b.tar.gz | |
new version
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index f77d17ea7d5..188d67ebcaf 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -25,12 +25,6 @@ (provide 'ediff-merg) -(defgroup ediff-merge nil - "Merging utilities" - :prefix "ediff-" - :group 'ediff) - - ;; compiler pacifier (defvar ediff-window-A) (defvar ediff-window-B) @@ -138,7 +132,6 @@ skiped over. Nil means show all regions.") )) (defun ediff-set-merge-mode () - ;; by Stig@hackvan.com (normal-mode t) (remove-hook 'local-write-file-hooks 'ediff-set-merge-mode)) |