diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1995-10-06 00:56:53 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1995-10-06 00:56:53 +0000 |
| commit | c439fb3045f133f26a1aaeb8a9d789f5bf80ad12 (patch) | |
| tree | d1b6c3be750f1d66550c605247525af871253de3 /lisp/ediff-merg.el | |
| parent | 8343426b70389bf284b13bc44a39bce1dd46b2e7 (diff) | |
| download | emacs-c439fb3045f133f26a1aaeb8a9d789f5bf80ad12.tar.gz | |
*** empty log message ***
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 3c6681d3fb7..3280861efdf 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -90,6 +90,7 @@ skiped over. Nil means show all regions.") ;; by Stig@hackvan.com (normal-mode t) (remove-hook 'local-write-file-hooks 'ediff-set-merge-mode)) + ;; Go over all diffs starting with DIFF-NUM and copy regions into buffer C ;; according to the state of the difference. @@ -113,7 +114,6 @@ skiped over. Nil means show all regions.") ediff-number-of-differences)) (setq state-of-merge (ediff-get-state-of-merge n)) - (setq do-not-copy (string= state-of-merge default-state-of-merge)) (if remerging (let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer)) |