Stack Overflow
Stack Overflow

Questions tagged [emacs-ediff]

Ediff is a feature of Emacs which allows comparing two or more files or buffers, as well as merging two files or buffers into one.

Ediff user manual: http://www.delorie.com/gnu/docs/emacs/ediff_1.html

Ediff page on Emacs wiki: http://emacswiki.org/emacs/EdiffMode

19 questions
1
vote
1 answer

Is it possible to enable ediff features by default?

I often use ediff-directories to diff directories containing many c/c++ files. Whenever I enter a file I always '##' to ignore white space in the diff. This becomes a problem when I have many files to diff. Is there any way to ignore white space…
CodeSmith
  • 103
  • 5
1
vote
1 answer

How can I merge whitespace diffs from file B to file A?

I want to merge whitespace diffs from file B to file A, but not merge non whitespace diffs as I want to navigate through them and examine one by one? Is this possible?
dchhetri
  • 6,926
  • 4
  • 43
  • 56
0
votes
1 answer

Emacs ediff-show-registry ignores ediff-setup-windows-plain

I have the following in my .emacs file... (setq ediff-window-setup-function 'ediff-setup-windows-plain) and indeed ediff usually does it's work with split buffers (2 files and the Control Panel). But if I type "R" (ediff-show-registry) in the…
user1100169
  • 1
  • 1
0
votes
1 answer

how to set variables interactively for ediff

I'm using ediff mode, and I'd like to split the windows horizontally instead of the vertical default. The ediff manual says this can be done interactively. ediff-split-window-function Controls the way you want the window be split between file-A…
roro
  • 931
  • 5
  • 21
1
2