Emacs Stack Exchange
Emacs Stack Exchange

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.

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

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

93 questions
27
votes
2 answers

How to use both variants in Ediff?

Ediff interface has + button, but it doesn't seem to do anything (the minibuffer invariably shows "nil" when I press it), I thought this button was meant for using both variants in the result buffer. Anyhow, the original question is: how do I make…
wvxvw
  • 11,342
  • 2
  • 31
  • 56
15
votes
3 answers

How do I compare regions in the same file?

ediff allows comparing files, buffers, and regions in different buffers. However, it does not let one compare sections in the same buffer. Until now I used isearch for that: C-s at the beginning of the 1st identical section, the beginning of the…
sds
  • 6,104
  • 22
  • 39
14
votes
3 answers

How can I quit ediff immediately without having to type 'y'

When I quit ediff with q I get asked if I really want to quit. I'd rather it quit immediately. There is nothing obvious under customization. There is a solution here which seems to work by redefining the q key, but I'm not sure of the details of how…
TooTone
  • 401
  • 4
  • 11
14
votes
2 answers

Ediff: view whitespace differences

Is there a way to make Ediff highlight whitespace using a different color, the way it does for non-whitespace differences? For example, here are two regions with only whitespace differences: And here are two regions with non-whitespace…
Tianxiang Xiong
  • 3,878
  • 18
  • 28
10
votes
5 answers

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?
denys
  • 315
  • 1
  • 11
7
votes
1 answer

Using ediff to view a Github pull request

I would like to be able to review Github pull requests as a single ediff "session" (if that's the right word). However, whenever I use magit-ediff from Magit, I can only ediff a single file at once, then I have to exit the ediff session and restart…
Lee H
  • 2,727
  • 1
  • 17
  • 31
6
votes
2 answers

How to get back to ediff mode from edit mode

Bear with me as I am a neophyte to Emacs. I followed http://pragmaticemacs.com/emacs/visualise-and-copy-differences-between-files/ to fire up Ediff in Emacs. It opened two buffers in two windows side-by-side. I then used p and n to move to the…
Black_Zero
  • 175
  • 4
5
votes
2 answers

How can I only show different lines in ediff?

This seems like such a basic feature to have in a diff mode, but I can't find anything in the documentation. If I have two 1000 line files, and only one line is different, I want to be able to hide the other 999 lines. Something like diff -y…
nanny
  • 5,756
  • 1
  • 20
  • 38
5
votes
0 answers

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 found a picture that shows what I mean: On the other…
Jorge Israel Peña
  • 1,265
  • 9
  • 17
4
votes
1 answer

How to manual set the specified paragraph to compare in ediff

For example, the following case. It seems the system mistakenly compare wrong paragraph. What I want to compare, for example, is the public static... with public static.... How can I do that? Thank you.
yuxuan
  • 781
  • 4
  • 15
4
votes
1 answer

How to quickly reopen ediff with the same files

I ran ediff on file A and B, and then quit it to do a git commit. Then I want to reopen ediff (let's call it rediff) with the same pair of files. How do I do this? There is the eregistry thing that I thought it is for this purpose.But I couldn't…
biocyberman
  • 962
  • 7
  • 18
3
votes
1 answer

make ediff jump to closest difference

I use ediff-revision or vc-ediff to compare the current state of a file respect its working revision. I normally do not want to check the whole file but just the difference at or closest to the current position. However, ediff will always start from…
ramestica
  • 31
  • 4
3
votes
1 answer

Display diff output side-by-side

I use the version control system fossil. I'd like to view fossil diff's output side-by-side in Emacs. The output looks like this: $ fossil diff Index: test1.txt ================================================================== --- test1.txt +++…
Geier
  • 722
  • 5
  • 15
3
votes
1 answer

Execute an ediff command while in one of the buffers

I want to mimic the behaviour of vim's do and dp in ediff mode. These two commands stand for "obtain diff" and "put diff". That is, if I'm on one difference in one buffer, pressing do would copy the difference from the other buffer, while pressing…
Nikola Knezevic
  • 163
  • 6
2
votes
0 answers

Show different on the specific chars

Linux Mint 20, Emacs 27.2 I compare two files by ediff Here result: As you can see the ediff show different on the specific line. But... I need to see different in the specific chars (A and Z). I need to change background only on the different…
a_subscriber
  • 4,062
  • 1
  • 18
  • 56
1
2 3