From: Theodore Tso <tytso@mit.edu>
To: Arjen Laarhoven <arjen@yaph.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Teach git-mergetool about Apple's opendiff/FileMerge
Date: Thu, 29 Mar 2007 10:03:12 -0400 [thread overview]
Message-ID: <20070329140312.GG2913@thunk.org> (raw)
In-Reply-To: <20070322213728.GD3854@regex.yaph.org>
Hi Arjen,
The version of your patch which I just checked into my sources
fixes the issues which Junio raised (whitespace issues, double quotes,
factoring out common code). The other change I made was that I
changed the search order so that by default opendiff is preferred over
emerge (on the assumption that MacOS developers are more likely to
want to use the GUI merge tool than emacs's merge tool). Of course,
people are free to set whatever they choose in their .gitconfig file.
Thanks for the patch!
- Ted
prev parent reply other threads:[~2007-03-29 14:03 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-22 21:37 [PATCH] Teach git-mergetool about Apple's opendiff/FileMerge Arjen Laarhoven
2007-03-23 4:45 ` Junio C Hamano
2007-03-23 4:52 ` Steven Grimm
2007-03-23 8:25 ` Arjen Laarhoven
2007-03-23 14:15 ` Theodore Tso
2007-03-23 18:42 ` Marco Roeland
2007-03-29 14:03 ` Theodore Tso [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=20070329140312.GG2913@thunk.org \
--to=tytso@mit.edu \
--cc=arjen@yaph.org \
--cc=git@vger.kernel.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.
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).