Mercurial > emacs

changeset 13129:9d432c26c3a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Michael Kifer <kifer@cs.stonybrook.edu>
date Fri, 06 Oct 1995 00:56:53 +0000
parents b0ec8d932b35
children c43bacb1bd0a
files lisp/ediff-merg.el
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
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))