From: Sascha Wilde <wilde@sha-bang.de>
Subject: Re: ediff between buffer and corresponding (changed) file
Date: Fri, 08 Dec 2006 17:19:20 +0100 [thread overview]
Message-ID: <4tthkfF14v8dcU1@mid.individual.net> (raw)
In-Reply-To: 1165590277.739247.260950@f1g2000cwa.googlegroups.com
"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)
next prev parent reply other threads:[~2006-12-08 16:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-08 14:38 ediff between buffer and corresponding (changed) file Sascha Wilde
2006-12-08 15:04 ` Robert Thorpe
2006-12-08 16:19 ` Sascha Wilde [this message]
2006-12-08 16:33 ` Robert Thorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4tthkfF14v8dcU1@mid.individual.net \
--to=wilde@sha-bang.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.