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
0
votes
0answers
7 views

Can not properly select region A in ediff-region-linewises Spacemacs

I want to compare two functions in a Python script, sat test.py, and I'm using Spacemacs (but really really new to it and any other general editor). I read that I can use ediff-region-linewise to do ...
0
votes
1answer
35 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
25 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
32 views

Merging diffs/hunks

When using ediff, I often get conflicts like this: <<<<<<< variant A added_function_1 () { ======= added_function_2 () { >>>>>>> variant B <<<<&...
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?
0
votes
1answer
31 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
60 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
37 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
99 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 ...
1
vote
1answer
224 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 ...
7
votes
2answers
507 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. ...
14
votes
1answer
259 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 ...
0
votes
1answer
236 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
163 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 ...
2
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 ...
0
votes
1answer
60 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
130 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 ...
9
votes
5answers
904 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?
2
votes
1answer
92 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 ...
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 ...
8
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 ...
0
votes
1answer
327 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 ...
11
votes
2answers
545 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
votes
1answer
215 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
135 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 ...
2
votes
1answer
263 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 ...
8
votes
4answers
812 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 ...
4
votes
1answer
787 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 ...
1
vote
1answer
246 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 ...
2
votes
2answers
589 views

How to use ediff with (hg) changesets?

I have not found a good way to use ediff with Mercurial changsets. What I want is basically the functionality of vc-dir, but for committed changesets. The input should be a changeset identifier, and I ...
1
vote
1answer
57 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
112 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
84 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
108 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) (...
17
votes
2answers
2k 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 result buffer. ...
4
votes
2answers
659 views

How to make vc-* and magit treat a symbolic link to a real file in git repo just like the original file?

Say, I got ~/.emacs which is a soft link to ~/.emacs.d/init.el(using ln -s ~/.emacs.d/init.el ~/.emacs) which is in a git repo, because this will make it easier to reach init.el, outside or inside ...
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. ...
1
vote
0answers
143 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 ...
4
votes
1answer
65 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
1answer
164 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 ...
7
votes
0answers
82 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.
13
votes
3answers
2k views

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 ...
4
votes
1answer
166 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
388 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
93 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
vote
1answer
176 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 ...
1
vote
0answers
24 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?
11
votes
1answer
553 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, ...
1
vote
2answers
1k 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-function '...
3
votes
1answer
986 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 =======================================...