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.
80
questions
0
votes
1
answer
27
views
My tiling window manager is crashing with ediff-mode window creation. How to fix it?
I am using Material Shell which is a tiling window manager created as an extension of GNOME Desktop Environment.
After an interactive rebase in Magit, a merge conflict happened. Thus, to fix it, I ...
- 869
0
votes
0
answers
13
views
Erratic Next behavior with ediff-buffers
We recently switched from Cinnamon to Gnome, and ever since then I have seen erratic behavior with ediff-buffers, whereby hitting n (Next) no longer reliably jump to the next change. It would ...
- 101
1
vote
1
answer
24
views
How to use ediff with JSON, so it abstracts from member order in objects?
Currently I use ediff a lot for diffing all sorts of text files. I also use it for looking at diffs between JSON files. The problem is that a lot of differences appear which are semantically ...
- 113
1
vote
0
answers
38
views
Output side-by-side ediff to html
Vim has a command :tohtml which is particularly useful when sharing side-by-side diffs to non-programmers - they can open the resulting html file to see the results of a vimdiff.
In emacs I use ediff ...
- 11
1
vote
0
answers
36
views
Magit ediff range in a pretty way?
I need to investigate a project, with a patch made by a former student of my university. He made a series of commits on a repo, and I need to see what additions he made.
I got the list of files ...
0
votes
1
answer
46
views
MAGIT: easier to read diffs
Is there a way in MAGIT to see diffs as one line instead of two with deletions and additions in one line? It would be much easier to navigate.
0
votes
0
answers
38
views
Can ediff be used to view an existing diff/patch?
Given an existing patch (for example, git show -c > my.diff; emacs my.diff)
Most of the commands that are part of ediff rely on having both source & destination available, or referencing ...
- 7,179
1
vote
1
answer
29
views
How to provide my own ediff-make-wide-display-function for ediff
For Ediff's wide display feature I like to use my own ediff-make-wide-display function. Ediff has a variable for this: ediff-make-wide-display-function. However when I write:
(defun my-ediff-make-wide-...
- 1,041
0
votes
1
answer
64
views
Ediff in one frame
I want to start Ediff in a single frame the way pacfiles does:
Right now it opens the control panel in a separate frame.
- 386
0
votes
0
answers
29
views
How to search only the difference region's while using ediff command?
While viewing diff b/w 2 files using ediff command, i want to search for a string only in the difference region. What is the right way to this?
EDIT: added clarification
- 345
2
votes
0
answers
18
views
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 ...
- 3,435
1
vote
1
answer
89
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,041
1
vote
1
answer
120
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 ...
- 135
0
votes
1
answer
80
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
1
answer
160
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
1
answer
111
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 ...
- 101
0
votes
3
answers
121
views
Finding missing 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 ...
- 825
1
vote
1
answer
86
views
Merging diffs/hunks
When using ediff, I often get conflicts like this:
<<<<<<< variant A
added_function_1 () {
=======
added_function_2 () {
>>>>>>> variant B
<<<<&...
- 999
0
votes
1
answer
117
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 ...
- 103
3
votes
1
answer
127
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 ...
- 133
0
votes
1
answer
141
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 ...
3
votes
3
answers
561
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 ...
- 5,972
1
vote
1
answer
702
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 ...
- 111
1
vote
1
answer
542
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 ...
- 137
2
votes
1
answer
337
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 ...
- 137
0
votes
1
answer
92
views
How to get p4merge like view with the ediff?
In the p4merge tool the layout for merging 2 files look like the following.
+---------------+--------------+
| | |
| | |
| ...
- 345
1
vote
1
answer
216
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 ...
- 1,668
2
votes
1
answer
140
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 ...
- 357
1
vote
1
answer
438
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 ...
- 13
3
votes
1
answer
436
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 ...
- 1,157
0
votes
1
answer
305
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 ...
- 1,764
4
votes
1
answer
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 ...
- 155
3
votes
1
answer
420
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 ...
- 31
3
votes
1
answer
444
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 ...
- 133
1
vote
1
answer
76
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 ...
- 509
2
votes
0
answers
150
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 ...
- 1,055
0
votes
1
answer
127
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 ...
- 959
0
votes
1
answer
165
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
0
answers
59
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.
...
- 315
9
votes
2
answers
4k
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 ...
- 4,546
1
vote
0
answers
227
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 ...
9
votes
4
answers
2k
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 ...
- 2,440
14
votes
2
answers
903
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 ...
- 3,740
1
vote
1
answer
221
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 ...
- 958
4
votes
1
answer
201
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 ...
- 741
1
vote
1
answer
578
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,...
- 1,833
2
votes
0
answers
143
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 ...
- 1,235
7
votes
0
answers
93
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.
- 171
8
votes
2
answers
789
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.
...
- 6,834
1
vote
1
answer
253
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 ...
- 333