Search Results
| Search type | Search syntax |
|---|---|
| Tags | [tag] |
| Exact | "words here" |
| Author |
user:1234 user:me (yours) |
| Score |
score:3 (3+) score:0 (none) |
| Answers |
answers:3 (3+) answers:0 (none) isaccepted:yes hasaccepted:no inquestion:1234 |
| Views | views:250 |
| Code | code:"if (foo != bar)" |
| Sections |
title:apples body:"apples oranges" |
| URL | url:"*.example.com" |
| Saves | in:saves |
| Status |
closed:yes duplicate:no migrated:no wiki:no |
| Types |
is:question is:answer |
| Exclude |
-[tag] -apples |
| For more details on advanced search visit our help page | |
Results tagged with ediff
Search options questions only
not deleted
user 2000
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.
8
votes
2
answers
3k
views
How do I ediff a buffer against a revision?
I want to run ediff to compare my current version of a file (in git) with a version of the file on a different branch.
I run M-x ediff-revision from within an open buffer for the file in question. … However, I want to be able to edit the current version (i.e., by hitting a or b in ediff to copy or remove blocks of diff) and the "current version" buffer is a read-only buffer with a manufactured name …
- 203