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.
M-x ediff-revision from within an open buffer for the file in question. I answer the two questions:
- Compare revisions for file: I blank this answer (the default is the current buffer which is correct).
- Revision 1 to compare: I accept the default again ("default file's latest version").
- Revision 2 to compare: I enter a git branch name
This works great for viewing the differences between the two files. However, I want to be able to edit the current version (i.e., by hitting
b in ediff to copy or remove blocks of diff) and the "current version" buffer is a read-only buffer with a manufactured name (
file.~git-branch~). I want the "current version" buffer to be the read-write buffer that I started with, not a read-only buffer on the current branch's version.