From: David Aguilar <davvid@gmail.com>
To: Markus Heidelberg <markus.heidelberg@web.de>
Cc: gitster@pobox.com, marcin.zalewski@gmail.com,
charles@hashpling.org, git@vger.kernel.org
Subject: Re: [PATCH] mergetool--lib: specialize diff options for emerge and ecmerge
Date: Sun, 3 May 2009 11:21:38 -0700 [thread overview]
Message-ID: <20090503182137.GC50640@gmail.com> (raw)
In-Reply-To: <200905030827.56932.markus.heidelberg@web.de>
Markus Heidelberg <markus.heidelberg@web.de> wrote:
> David Aguilar, 02.05.2009:
> > I installed ecmerge on a mac today and gave this a try.
> > ecmerge is indeed better with this patch.
> >
> > After configuring the path it all "just works":
> >
> > $ git config --global mergetool.ecmerge.path \
> > /Applications/ECMerge.app/Contents/MacOS/guimerge
>
> Would it make sense to set merge_tool_path to guimerge by default then?
>
> Markus
On Linux, ecmerge is "ecmerge".
Macs are weird. Windows--even worse.
We could test $(uname) = "Darwin" and do the user-friendly thing by default,
but that might not be a good idea. The user-friendly thing is actually
"/Applications/...lots.of.stuff.../guimerge", and that's a lot more
platform-specific than just "guimerge".
The usability fairy says we should be nice to users and turn
translate_merge_tool_path() into a massive platform-specific
hack. The lazy person in me would rather list the tweaks
on the git wiki and silently reward linux users since
the defaults work fine there as-is.
What do you think?
--
David
next prev parent reply other threads:[~2009-05-03 18:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-02 8:57 [PATCH] mergetool--lib: specialize diff options for emerge and ecmerge David Aguilar
2009-05-02 19:46 ` David Aguilar
2009-05-03 6:27 ` Markus Heidelberg
2009-05-03 18:21 ` David Aguilar [this message]
2009-05-03 19:12 ` Markus Heidelberg
2009-05-03 20:34 ` David Aguilar
2009-05-03 18:47 ` Marcin Zalewski
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=20090503182137.GC50640@gmail.com \
--to=davvid@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=marcin.zalewski@gmail.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).