Re: [PATCH] mergetool--lib: specialize diff options for emerge and ecmerge

From: David Aguilar <davvid@gmail.com>
Date: May 3, 2009, 18:21 UTC
Message-ID: <20090503182137.GC50640@gmail.com>
In-Reply-To: <200905030827.56932.markus.heidelberg@web.de>

Markus Heidelberg <markus.heidelberg@web.de> wrote:

Show 12 quoted lines

> 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