Source

ediff / ediff-merg.el

Diff from to

File ediff-merg.el

 
 	(reverse delim-regs-list)
 	)))
-	
+
+(eval-when-compile (defvar state-of-merge)) ; dynamic var
 
 ;; Check if the non-preferred merge has been modified since originally set.
 ;; This affects only the regions that are marked as default-A/B or combined.