Re: ediff between buffer and corresponding (changed) file

[Sascha Wilde]

"Robert Thorpe" <rthorpe@realworldtech.com> wrote:
> Sascha Wilde wrote:
>> - I'm editing a file
>> - the file is changed by someone (or something) else on disk
>> - I want to safe my changes and emacs asks if I want to overwrite the
>>   changes on disk
>>
>> now I would like to make a diff and merge between my version and the
>> version on disk, but I can't find a straight forward way top do this,
>> without writing a temporary file.
>
> It is a recent addition, which can be added by inserting some elisp.
> See this thread:-
> http://groups.google.co.uk/group/gnu.emacs.help/browse_frm/thread/ee86853ef6243e5f/3b7bdaedebb77c2e?lnk=st&q=ediff+buffer+underlying+file+emacs&rnum=1#3b7bdaedebb77c2e
> Message-ID: <m2odtujmix.fsf@janus.isnogud.escape.de>

Thanks.  diff-buffer-with-file is indeed neat, but I would like a
ediff version much better, as it allows for not only seeing the
changes but merging, too.

cheers
sascha
-- 
Sascha Wilde : "GUIs normally make it simple to accomplish simple 
             : actions and impossible to accomplish complex actions."
             : (Doug Gwyn - 22/Jun/91 in comp.unix.wizards)