all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Sean Sieger <sean.sieger@gmail.com>
To: help-gnu-emacs@gnu.org
Subject: Re: ediff
Date: Sat, 11 Apr 2009 19:20:36 -0400	[thread overview]
Message-ID: <87ocv2srp7.fsf@gmail.com> (raw)
In-Reply-To: 026D8047-C68F-4102-B551-2BBD9D059B2D@Web.DE

Peter Dyballa <Peter_Dyballa@Web.DE> writes:

    It's one possible form. The other is the unified context diff,
    involving the -u option.

Got it.  I found ediff-custom-diff-options and used it.

    You can easily check whether it works: copy the elder a version to /
    tmp and then patch it with the Ediff output file (Ediff can also patch).

Tried this also.  Thank you for the encouragement, Pete.  Um, I'm still
trying to see it through a developer's eyes.  The exercise that you
suggested helped a lot though.

Say I don't want to mess up files in my emacs/ so I do something like
move a copy of buffers.texi to /tmp ... but see ... that's where it
breaks down in my mind, knowing that when I run Ediff, it's going to
rename the elder file buffers.texi.orig ... but I cannot start out with
two files named buffers.texi in /tmp ...

Help, please.





  reply	other threads:[~2009-04-11 23:20 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-10 15:07 ediff Sean Sieger
2009-04-11  7:41 ` ediff Sebastien Le Maguer
2009-04-11 17:43   ` ediff Sean Sieger
2009-04-11 18:24     ` ediff Peter Dyballa
2009-04-11 18:40       ` ediff Sean Sieger
2009-04-11 21:20         ` ediff Peter Dyballa
2009-04-11 23:20           ` Sean Sieger [this message]
2009-04-12  7:41             ` ediff Peter Dyballa
2009-04-12 13:03               ` ediff Sean Sieger

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=87ocv2srp7.fsf@gmail.com \
    --to=sean.sieger@gmail.com \
    --cc=help-gnu-emacs@gnu.org \
    /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.