Seems you are using an old emacs/vc/vc-hg version. Simply upgrading is probably the easiest solution. I had a similar problem, which I could solve bit by bit by improving small settings and even made a patch. It never really solved all. Until I upgrade to a recent emacs (and support file); I use the Aquamacs … Read more
This does the same thing as Trey Jackson’s helpful answer, and it’s much simpler. Pressing d will copy both A and B to buffer C. (defun ediff-copy-both-to-C () (interactive) (ediff-copy-diff ediff-current-difference nil ‘C nil (concat (ediff-get-region-contents ediff-current-difference ‘A ediff-control-buffer) (ediff-get-region-contents ediff-current-difference ‘B ediff-control-buffer)))) (defun add-d-to-ediff-mode-map () (define-key ediff-mode-map “d” ‘ediff-copy-both-to-C)) (add-hook ‘ediff-keymap-setup-hook ‘add-d-to-ediff-mode-map)