Mercurial > emacs
diff lisp/ediff-merg.el @ 13129:9d432c26c3a7
*** empty log message ***
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Fri, 06 Oct 1995 00:56:53 +0000 |
parents | 87f8b79217b3 |
children | b9dc8cc658d5 |
line wrap: on
line diff
--- a/lisp/ediff-merg.el Fri Oct 06 00:55:57 1995 +0000 +++ b/lisp/ediff-merg.el Fri Oct 06 00:56:53 1995 +0000 @@ -90,6 +90,7 @@ ;; 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 @@ 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))