[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: ediff between buffer and corresponding (changed) file
|
From: |
Robert Thorpe |
|
Subject: |
Re: ediff between buffer and corresponding (changed) file |
|
Date: |
8 Dec 2006 07:04:37 -0800 |
|
User-agent: |
G2/1.0 |
Sascha Wilde wrote:
> Hi *,
>
> the (not too uncommon) situation is this:
>
> - 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.
>
> Am I missing something?
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>