Questions tagged [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.

Filter by
Sorted by
Tagged with
5
votes
2answers
716 views

Restoring windows and layout after an Ediff session

Looking for a solution on how to restore my window layout after an Ediff session, I found a blog post, where the author suggests: (winner-mode) (add-hook 'ediff-after-quit-hook-internal 'winner-...
51
votes
1answer
2k views

How to view diff when emacs suggests to recover this file?

Sometimes it happens: emacs prompts you about recovering unsaved changes to a file, but you cannot remember if you want those changes or not. Starting at the recover-this-file buffer, is there a way ...
16
votes
3answers
2k views

How to start ediff-ing a file that has git conflict markers in it?

Following an attempted git merge on the commandline, my file now has standard conflict markers in it which emacs has helpfully reloaded (reverted?) in the buffer. How do I start some kind of merging ...
11
votes
5answers
5k views

Comparing two text files on a Windows system

Since ediff-files and ediff-buffers result in apply: Searching for program: no such file or directory, diff error on windows machines. How to compare two files using Emacs on a windows system?
11
votes
1answer
517 views

On “really edit the buffer”, have emacs run ediff-current-file automatically?

Context When emacs detects that a file was changed outside of an editing buffer. Observed emacs will ask: somefilename changed in disk; really edit the buffer? (y, n, r or C-h) (Incidentally, ...
9
votes
5answers
820 views

How to kill ediff's buffers on quit?

How to kill (C-x k) ediff's (A,B,C) buffers automatically on each ediff-quit?
7
votes
2answers
2k views

Launch emacs with ediff-files (of ediff-directories) from command line

I would like to launch emacs to ediff either files or directories. For example, I'd like something like: emacs -f ediff-files file1 file2 But when I do this, it doesn't take file1 and file2 as the ...
3
votes
3answers
796 views

How to undo on ediff A-B changes

Is there a keybind or a way of undoing each of ediff A-B change? I often want to revert the previous modification.
3
votes
2answers
2k views

How can I compare two commit diffs in magit?

I want to directly compare the diffs of two commits in emacs (rather than seeing the diff of two trees at given commit points). A bonus would be being able to use ediff mode to compare the two ...
2
votes
1answer
132 views

Ediff: compare two (long) buffers Word-by-word

I use Emacs 26.1 and try to compare two (long) buffers (opened side by side) by clicking Tools -> Compare (Ediff) -> Windows Word-by-word... Then I choose both Windows (A and B) by clicking on each ...
0
votes
1answer
174 views

Ediff: compare two files Word-by-word

I use Emacs 26.1 and would like to compare two files word-by-word. Clicking "Tools -> Compare (Ediff) -> Windows Word-by-word..." allows only to compare the visible parts of two buffers, not the whole ...