diff -c -b /home/tehom/.emacs.d/ediff/ediff-util.old.el /home/tehom/.emacs.d/ediff/ediff-util.fix.el
*** /home/tehom/.emacs.d/ediff/ediff-util.old.el	Mon Nov 15 22:33:34 2010
--- /home/tehom/.emacs.d/ediff/ediff-util.fix.el	Wed Nov 17 13:47:53 2010
***************
*** 3477,3483 ****
  	(possibilities (list ?A ?B ?C))
  	(zmacs-regions t)
  	use-current-diff-p
! 	begA begB endA endB bufA bufB)
  
      (if (ediff-valid-difference-p ediff-current-difference)
  	(progn
--- 3477,3483 ----
  	(possibilities (list ?A ?B ?C))
  	(zmacs-regions t)
  	use-current-diff-p
! 	begA begB endA endB bufA bufB symA symB)
  
      (if (ediff-valid-difference-p ediff-current-difference)
  	(progn
***************
*** 3487,3499 ****
--- 3487,3502 ----
  
      (cond ((ediff-merge-job)
  	   (setq bufB ediff-buffer-C)
+ 	   (setq symB 'C)
  	   ;; ask which buffer to compare to the merge buffer
  	   (while (cond ((eq answer ?A)
  			 (setq bufA ediff-buffer-A
+ 			       symA 'A
  			       possibilities '(?B))
  			 nil)
  			((eq answer ?B)
  			 (setq bufA ediff-buffer-B
+ 			       symA 'B
  			       possibilities '(?A))
  			 nil)
  			((equal answer ""))
***************
*** 3514,3519 ****
--- 3517,3523 ----
  			       (eval
  				(ediff-get-symbol-from-alist
  				 answer ediff-buffer-alist)))
+ 			 (setq symA (intern (string answer)))
  			 nil)
  			((equal answer ""))
  			(t (beep 1)
***************
*** 3533,3538 ****
--- 3537,3544 ----
  			       (eval
  				(ediff-get-symbol-from-alist
  				 answer ediff-buffer-alist)))
+ 			 (setq symB (intern (string answer)))
+ 			   
  			 nil)
  			((equal answer ""))
  			(t (beep 1)
***************
*** 3548,3553 ****
--- 3554,3561 ----
  	  (t ; 2way comparison
  	   (setq bufA ediff-buffer-A
  		 bufB ediff-buffer-B
+ 	         symA 'A
+ 	         symB 'B
  		 possibilities nil)))
  
      (if (and (ediff-valid-difference-p ediff-current-difference)
***************
*** 3556,3562 ****
  
      (setq bufA (if use-current-diff-p
  		   (ediff-clone-buffer-for-current-diff-comparison
! 		    bufA 'A "-Region.A-")
  		 (ediff-clone-buffer-for-region-comparison bufA "-Region.A-")))
      (ediff-with-current-buffer bufA
        (setq begA (region-beginning)
--- 3564,3570 ----
  
      (setq bufA (if use-current-diff-p
  		   (ediff-clone-buffer-for-current-diff-comparison
! 		    bufA symA "-Region.A-")
  		 (ediff-clone-buffer-for-region-comparison bufA "-Region.A-")))
      (ediff-with-current-buffer bufA
        (setq begA (region-beginning)
***************
*** 3571,3577 ****
  
      (setq bufB (if use-current-diff-p
  		   (ediff-clone-buffer-for-current-diff-comparison
! 		    bufB 'B "-Region.B-")
  		 (ediff-clone-buffer-for-region-comparison bufB "-Region.B-")))
      (ediff-with-current-buffer bufB
        (setq begB (region-beginning)
--- 3579,3585 ----
  
      (setq bufB (if use-current-diff-p
  		   (ediff-clone-buffer-for-current-diff-comparison
! 		    bufB symB "-Region.B-")
  		 (ediff-clone-buffer-for-region-comparison bufB "-Region.B-")))
      (ediff-with-current-buffer bufB
        (setq begB (region-beginning)

Diff finished.  Wed Nov 17 14:14:57 2010