From: Michael Kifer <kifer@cs.stonybrook.edu>
Date: Fri, 6 Oct 1995 00:56:53 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-19.34~2731
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c439fb3045f133f26a1aaeb8a9d789f5bf80ad12;p=emacs.git

*** empty log message ***
---

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))