From: David Aguilar <davvid@gmail.com>
To: Markus Heidelberg <markus.heidelberg@web.de>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH 2/3] mergetool-lib: specialize xxdiff options when in diff mode
Date: Thu, 2 Apr 2009 18:56:12 -0700 [thread overview]
Message-ID: <20090403015610.GB52576@gmail.com> (raw)
In-Reply-To: <200904022320.55334.markus.heidelberg@web.de>
On 0, Markus Heidelberg <markus.heidelberg@web.de> wrote:
> David Aguilar, 02.04.2009:
> > We don't need '-merged-file', 'save as', and the merge-status exit
> > code when in diff mode
>
> I guess the same as for xxdiff and kdiff3 also applies to opendiff,
> ecmerge and emerge. But since I don't have them installed, I'm not
> entirely sure not to break something.
> On the other hand it should be save, since they were just copied from
> git-mergetool without adjustment for diff use.
>
> Markus
>
I have opendiff on a mac at work so I'll give it a test there
and send a patch once it's working.
--
David
prev parent reply other threads:[~2009-04-03 1:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-02 10:30 [PATCH 1/3] mergetool-lib: specialize kdiff3 options when in diff mode David Aguilar
2009-04-02 10:30 ` [PATCH 2/3] mergetool-lib: specialize xxdiff " David Aguilar
2009-04-02 10:30 ` [PATCH 3/3] mergetool-lib: add diffuse as merge and diff tool David Aguilar
2009-04-02 10:42 ` David Aguilar
2009-04-02 18:06 ` Junio C Hamano
2009-04-02 21:20 ` [PATCH 2/3] mergetool-lib: specialize xxdiff options when in diff mode Markus Heidelberg
2009-04-03 1:56 ` David Aguilar [this message]
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=20090403015610.GB52576@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=markus.heidelberg@web.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).