Stack Overflow
Stack Overflow

Questions tagged [emacs-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

20 questions
41
votes
4 answers

Conflict resolution with Emacs Ediff: How can I take the changes of both versions

(Question adapted from How do I combine the two variants of a conflict in emacs' emerge?) I have a file with merge conflict markers. It looks similar to this: <<<<<<< HEAD 522ADC9C14B2FD9D00F56BAD /* close_test_button.png in Resources…
koppor
  • 14,964
  • 11
  • 100
  • 141
32
votes
1 answer

emacs ediff-revision for Hg complains about Wrong number of arguments

Trying to get ediff-revision working on hg (mercurial-1.8.4) repo using Emacs v23.2 (9.0) on OS X Lion. I found this answer for the 1st part of my problem but now I'm getting this from Emacs ediff-revision: M-x ediff-revision Compare revisions for…
user1161189
  • 321
  • 2
  • 3
20
votes
2 answers

Can ediff merge simultaneously show the ancestor, A, B, and merge buffers?

I'm a die-hard emacs user, but so far have always used kdiff3 for 3-way merges with ancestor, e.g. when performing git merge or rebase. I really like the way that kdiff3 can not only simultaneously display all four versions of the text being…
Adam Spiers
  • 15,491
  • 5
  • 40
  • 61
15
votes
5 answers

How can I use ediff under Windows + NTEmacs?

I have Emacs version 23 on Windows and it seem the ediff executable is missing? From where can I download ediff for Emacs on Windows?
sam
  • 251
  • 2
  • 5
12
votes
3 answers

ediff-split-window-function horizontal==vertical?

Emacs 23.1.1 Ediff 2.81.2 on CentOs 6 Prior to any customization, Ediff would, by default, split the windows horizontally (one on top of the other). I wanted them side by side so I tried adding the following lines to my .emacs (setq…
roadrider
  • 179
  • 2
  • 7
6
votes
1 answer

Ediff as git difftool

I'm trying to use emacs ediff as a git difftool. I have followed some of the configurations proposed here: Using ediff as git mergetool When it comes to comparing between different git revisions of a certain file, I have not problem at all: ediff…
Bob V
  • 63
  • 1
  • 4
5
votes
3 answers

Emacs ediff marked files in different dired buffers

I have the following function which runs ediff on the files I have marked in a dired buffer: (defun mkm/ediff-marked-pair () "Run ediff-files on a pair of files marked in dired buffer" (interactive) (let ((marked-files (dired-get-marked-files…
mkm
  • 645
  • 5
  • 19
5
votes
3 answers

emacs ediff refresh buffers

I am using emacs ediff to compare two files that I frequently update. How can I refresh or update the buffer to reflect the new file without killing and reloading ediff? When I try to update each file using C-x C-v, the Ediff Control Panel says "You…
Smed
  • 205
  • 2
  • 5
5
votes
3 answers

How can I get ediff mode to stop highlighting lines that differ only by whitespace?

I have two similar functions in C++ that I want to carefully compare. I'm using the emacs function ediff-regions-linewise to compare them line-by-line. Many of the lines have small differences in their whitespace, for example: //Line from first…
Dan
  • 10,845
  • 11
  • 46
  • 75
3
votes
0 answers

Does the ediff mode of Emacs support synchronization points?

I have been using the ediff mode of Emacs for many years now, and I just realized that whenever I need synchronization points (*) to make sense of a diff, I fall back to Meld or KDiff3. Isn't there some support for synchronization points in ediff?…
Markus
  • 2,963
  • 2
  • 18
  • 27
2
votes
2 answers

Using ediff with C-x s (save-some-buffers) in Emacs?

C-x s uses diff to show changes. How can I use ediff instead?
Yoo
  • 15,338
  • 6
  • 37
  • 46
2
votes
0 answers

Can I use ediff against a svn branch?

I frequently have conflicting changes in another subversion branch I need to merge into my branch; ediff would go a long ways to making that easier. However, it seems psvn.el and ediff only support diffing against a revision in the same branch,…
Eddie
  • 135
  • 3
  • 10
2
votes
1 answer

How can I kill-ring-save one region's buffer with ediff?

I am doing an ediff in emacs and I want to copy the region in one of the buffers in order to paste it into a third buffer. Obviously I can do this manually, but I'd like to be able to do it with a few keystrokes similar to how a and b can be used…
Samuel Edwin Ward
  • 6,135
  • 3
  • 28
  • 59
1
vote
0 answers

How to compare two binary files with emacs ediff?

How to compare two binary files using only emacs and emacs packages (possibly user-contributed)? There have been numerous posts about binary diffs with a variety of tools (like gvimdiffor colordiff) but I'm surprised apparently none about using pure…
user12030145
1
vote
1 answer

Is there a way to use hg record with ediff?

I've used hg record to great effect lately, but it's pretty cumbersome. Emacs ediff is a great merge tool, but I haven't seen any way to get it to work with hg record. Is there something I can stick in my .hgrc that will let me use ediff with hg…
nmichaels
  • 45,418
  • 12
  • 95
  • 127
1
2