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.
70
questions
0
votes
0answers
13 views
How to switch to ediff-mode from diff-mode (using the currently open diff)
I would like a quick way to switch to ediff from diff-mode (since it's capable of staging git changes), is this possible?
1
vote
1answer
36 views
How to setup ediff to open a new frame with the two comparison buffers
When I issue M-x ediff-buffersI'd like ediff to create a new frame with the two buffers (and close this frame when done with the comparison). How can I customise ediff to do so?
I tried
(defun leo-...
1
vote
1answer
34 views
While merging, how to tell Magit to use one version of the file?
When I merge something and there are conflicts, I can go to the file in the magit status page (SPC-g-s) and press, for example, e to start ediff. Within that, I can scroll through all conflicts and ...
0
votes
1answer
40 views
How to efficiently merge 2 buffers which are partially overlapping?
Problem summary
Imagine, you have 2 shopping lists:
1 huge one with hundreds of entries - list A, copied into buffer A
1 containing dozens of entries - list B, copied into buffer B
Then:
75% of ...
1
vote
1answer
75 views
How to `ediff-buffer` with ansi-colors (script output)? `ediff-file` works!
Context: files with ANSI and other terminal color codes.
I often record terminal transcripts using the traditional script program or expect. Colored ls output, colored grep matches, mc and other ...
0
votes
1answer
75 views
How to abort an ediff merge?
I use ediff to merge mercurial conflicts (and sometimes git conflicts), but I can't seem to abort. Ediff pops up as soon as a conflict is detected, and quitting and not saving results in mercurial ...
0
votes
1answer
40 views
Finding missing Ediff key bindings
I was just looking at the Ediff manual¹ for something, and it's one of those Emacs manuals that (a bit annoyingly) only list keybinds and not function names (so, if you have rebinding going on, you ...
1
vote
1answer
62 views
Merging diffs/hunks
When using ediff, I often get conflicts like this:
<<<<<<< variant A
added_function_1 () {
=======
added_function_2 () {
>>>>>>> variant B
<<<<&...
0
votes
1answer
85 views
Setting mode-line font size and Magit diff colours
I'd like to adjust the background colour of the part of the diffs displayed by Magit. In particular, the background colour of the text 1st, 2nd, and 3rd in the image. I'd like to increase the contrast ...
3
votes
1answer
94 views
magit ediff conflicts wordwise
During a magit-rebase I'm running into conflicts on single long lines, where I'd like to take some parts of the line from the A and some from the B buffer.
After hitting * -refine current region ...
0
votes
1answer
83 views
How do I do the key strokes `C-M-c` in spacemacs?
I'm using spacemacs but trying to use ediff-regions-linewise to compare a couple regions of text. In order to confirm the selection, I need to do C-M-c.
This is probably a silly question, but how do ...
2
votes
3answers
260 views
How can I diff two long lines from the same buffer?
When I run tests for my projects, failing tests produce output that looks something like this:
expected: "..."
but got: "..."
The "..." are long lines that often only have small ...
0
votes
1answer
460 views
emacs ediff show all buffer diff word-wise (like vimdiff)
Issue description
When launching Ediff color scheme is very poor and i do not have word wise diff highlight. It seems that diff color faces are not activated at ediff startup.
I use emacs -Q to ...
0
votes
1answer
395 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 ...
2
votes
1answer
242 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
82 views
How to get p4merge like view with the ediff?
In the p4merge tool the layout for merging 2 files look like the following.
+---------------+--------------+
| | |
| | |
| ...
1
vote
1answer
157 views
Unable to use ediff with emacs and evil due to window configuration
Running emacs 25.2.2 with evil installed and updated from Melpa.
When I run ediff, it asks for usual buffer A and buffer B and then ONLY the ediff buffer in its own frame is visible with 'Type ? for ...
2
votes
1answer
108 views
Find the first difference between two buffers
Given two buffers, how do I find the first character position where their contents differ? E.g. for contents abcdef and abcDeF, the first difference would be at point=4. For abc and ab, it would be at ...
0
votes
1answer
398 views
Is there a way for ediff to compare SVN changes in the head to my local copy?
My company uses SVN, and one of the things I often want to do is compare the differences that someone else checked in without doing an update. For example, if I see someone has committed a new ...
3
votes
1answer
332 views
Does magit when using ediff have a means for moving on the next file when there are multiple files to be diffed?
I am using ediff to get side by side diffs with magit and there seems to be no way to move to the next pair of files, after diffing the current file.
For instance if I use vimdiff for git diff, after ...
0
votes
1answer
225 views
script to Ediff two files in running gui Emacs?
I'm putting together a presentation that involves some live demos in the terminal. In one of the demos, I run a shell script that takes an input file, runs it through an Awk script, and generates a ...
4
votes
1answer
1k views
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 ...
3
votes
1answer
350 views
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 ...
3
votes
1answer
333 views
Magit diff working file to commit in log?
How does one ediff a current file--ie working tree--against an arbitrary version in some previous commit?
In this case, I'm interested in pulling in some, but not all, changes from a commit in ...
1
vote
1answer
64 views
How to view ediff (and other) manuals within emacs?
I want to learn how to use a built in package (e.g. ediff). This built-in package has an online manual in html, but presumably this content is also available from within emacs.
How do I view it ...
2
votes
0answers
125 views
Ediff: How to fill missing lines (gap) to achieve vertical alignment? [closed]
Oftentimes there are gaps in a side-by-side differential. That is some lines were added, some were removed. As I currently see it, ediff does not fill this gap by default. Thus, vertical alignment ...
0
votes
1answer
111 views
How to keep cursor position after calling ediff-current-file?
I would like to use ediff-current-file to jump to some of my previous changes/edits. However, when I type 'q' to quit ediff after calling ediff-current-file and navigation (using 'p'/'n'), the cursor ...
0
votes
1answer
141 views
vdiff-refine-all-hunks/ediff-update-diffs in startup eval
I'm having a problem with putting vdiff-refine-all-hunks or ediff-update-diffs into --eval for startup. Take vdiff as example, I'm calling it using:
emacs --eval "(progn (vdiff-files file1 file2) (...
2
votes
0answers
50 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.
...
5
votes
2answers
3k 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 ...
1
vote
0answers
180 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 ...
asked Oct 11 '16 at 16:27
Gilles 'SO- stop being evil'
17.4k4 gold badges44 silver badges80 bronze badges
9
votes
4answers
1k views
Diff of two buffers without creating temporary files
I need the diff of two buffers. One way would be to create temporary files containing the contents of these buffers and to use the diff function. However, the buffers contain sensitive information ...
13
votes
2answers
734 views
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 ...
1
vote
1answer
189 views
How to make ediff-patch-file strip leading path components?
I have a multi-file patch and ediff-patch-file doesn't find the files unless I manually remove all of the "a/" and "b/" prefixes from the patch first. In other words, it acts like "patch -p0" when I ...
4
votes
1answer
190 views
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 ...
1
vote
1answer
514 views
How can I resize certain windows evenly when using the golden-ratio library?
I'm using golden-ratio and ediff.
I want golden-ratio-mode turned off when using ediff and turned on after I finish merging with magit.
I cannot figure out a way to evenly balance Ediff's windows (A,...
2
votes
0answers
118 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 ...
7
votes
0answers
88 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.
7
votes
2answers
674 views
Prevent folding org files opened by ediff
Folding gets in the way when merging two org files using ediff, so I'm trying to disable all folding in org-mode buffers created by ediff. Non-ediff folding behavior should remain unaffected.
...
1
vote
1answer
207 views
Ediff directories with remote path (and Prelude?)
I need to compare from time to time the contents (source code) of a remote directory with a local one. And I would like to mark for hiding those files/subdirs that are identical (that is, use the =h ...
4
votes
1answer
80 views
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 ...
1
vote
0answers
36 views
How to exit from ediff-buffers? [duplicate]
I've run ediff-buffers to compare two versions of the same file, how can I now exit from this diff? How can I restore the view of the buffer?
1
vote
2answers
2k views
ediff - change colors and how to merge code
first question: is how to adjust colors of ediff-revision output, tried various versions - no luck:
;; Customizing colors used in diff mode
(load-library "ediff")
(setq ediff-window-setup-...
22
votes
2answers
3k views
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 ...
12
votes
1answer
660 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, ...
11
votes
3answers
2k views
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 ...
10
votes
5answers
1k 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?
15
votes
1answer
431 views
Never create frame in ediff
In general, I dislike frames. Right now, I'm using
(setq ediff-window-setup-function #'ediff-setup-windows-plain)
To ensure that ediff does not create a frame when it starts.
However, certain ...
3
votes
1answer
1k views
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
=======================================...
3
votes
1answer
1k views
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 ...
