From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Sascha Wilde <wilde@sha-bang.de>
Newsgroups: gmane.emacs.help
Subject: ediff between buffer and corresponding (changed) file
Date: Fri, 08 Dec 2006 15:38:05 +0100
Message-ID: <4ttbmjF1546mpU1@mid.individual.net>
NNTP-Posting-Host: dough.gmane.org
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Trace: sea.gmane.org 1165588977 29147 80.91.229.10 (8 Dec 2006 14:42:57 GMT)
X-Complaints-To: usenet@sea.gmane.org
NNTP-Posting-Date: Fri, 8 Dec 2006 14:42:57 +0000 (UTC)
Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Fri Dec 08 15:42:57 2006
Return-path: <help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org>
Envelope-to: geh-help-gnu-emacs@m.gmane.org
Original-Received: from lists.gnu.org ([199.232.76.165])
	by dough.gmane.org with esmtp (Exim 4.50)
	id 1Gsgw9-0007K7-Tm
	for geh-help-gnu-emacs@m.gmane.org; Fri, 08 Dec 2006 15:42:54 +0100
Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1Gsgw9-0005Yi-FX
	for geh-help-gnu-emacs@m.gmane.org; Fri, 08 Dec 2006 09:42:53 -0500
Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!news-spur1.maxwell.syr.edu!news.maxwell.syr.edu!news.tele.dk!news.tele.dk!small.news.tele.dk!fu-berlin.de!uni-berlin.de!individual.net!not-for-mail
Original-Newsgroups: gnu.emacs.help
Original-Lines: 22
Original-X-Trace: individual.net oydyjdJuufbX7F74r05f2AoWinwkFhZJB/ZMV5qAjaObVzWZq+
User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.91 (gnu/linux)
Original-Xref: shelby.stanford.edu gnu.emacs.help:143749
Original-To: help-gnu-emacs@gnu.org
X-BeenThere: help-gnu-emacs@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Users list for the GNU Emacs text editor <help-gnu-emacs.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/help-gnu-emacs>,
	<mailto:help-gnu-emacs-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/help-gnu-emacs>
List-Post: <mailto:help-gnu-emacs@gnu.org>
List-Help: <mailto:help-gnu-emacs-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/help-gnu-emacs>,
	<mailto:help-gnu-emacs-request@gnu.org?subject=subscribe>
Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org
Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.help:39351
Archived-At: <http://permalink.gmane.org/gmane.emacs.help/39351>

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?

cheers
sascha
-- 
Sascha Wilde

I've always figured UNIX is a utility to be run under emacs.
	-- Charles R. Martin