Questions tagged [diff]

The tag has no usage guidance.

4 questions with no upvoted or accepted answers
Filter by
Sorted by
Tagged with
2
votes
0answers
106 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
0answers
20 views

Using diff-buffer-with-file to merge differences between the disk and the buffer

I sync my org files via Dropbox. Occasionally, Dropbox will bring in changes into a file whose buffer I've already modified. I can diff the buffer and the file on disk with diff-buffer-with-file; but ...
1
vote
0answers
163 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 ...
1
vote
0answers
56 views

C++ source highlight in Diff mode

I'd like to know if Emacs has an option to highlight the portions of C++ source inside .diff files generated by e.g. git diff HEAD~1 or git log -p Right now I have to rename my .diff file to ...