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.

7 questions with no upvoted or accepted answers
Filter by
Sorted by
Tagged with
7
votes
0answers
81 views

Ediff location pane

Is there a way to create something similar to the location pane from win merge in ediff? Not having this is about the only reason I use win merged instead of ediff.
3
votes
0answers
236 views

ediff show empty lines

I'm not sure how to describe this. In vimdiff I remember that if one of the buffers had added a line, the other buffer showed lines at that same vertical location to show where they were added. I ...
2
votes
0answers
46 views

several ediff sessions in one emacs

f.e. I want to compare 2 pair of files file1 vs file11 file2 vs file22 For now I run the bash for, loop over 2 file pairs and run emacs 2 times. But it is not so convenient because I can not go back. ...
2
votes
0answers
91 views

emacs-show-diff-output produces empty buffer

EDIT: I figured it out. It seems to be an emacs bug. My walk-through of the bug is below. I just now found out about emacs-show-diff-output, which is bound to D by default in an ediff session. When ...
2
votes
0answers
317 views

How do I use split-window-sensibly with ediff-setup-windows-plain together?

I want ediff to use split-window-sensibly so it will stack the diffs on top/bottom when the window is narrow, but side-by-side when the window is wide. I'd like to use a single frame instead of the ...
1
vote
0answers
11 views

Merging diffs/hunks

When using ediff, I often get conflicts like this: <<<<<<< variant A added_function_1 () { ======= added_function_2 () { >>>>>>> variant B <<<<&...
1
vote
0answers
135 views

Ignore certain changes in Ediff

I have two versions of a file (or buffer) and I'm running ediff to compare them. Some of the changes are irrelevant and I want to ignore them. Specifically, foo has been renamed to bar in places and I ...