From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Wed, 29 Apr 2009 20:00:11 GMT
Subject: Re: Question on merge and mergetool settings
Message-ID: <200904292200.11373.markus.heidelberg@web.de>
In-Reply-To: <450196A1AAAE4B42A00A8B27A59278E70AE3F2FE@EXCHANGE.trad.tradestation.com>

John Dlugosz, 29.04.2009:
> In my config files which I inherited from someone else, there is an
> entry for "url" as well as for "path" under [merge] et al.

What is "et al." in this case? [mergetool]?

> I can't find that mentioned in the git-config manual.  Is that really
> used?

No.

There is remote.<name>.url, mergetool.<name>.path
There is no merge.url, merge.path, mergetool.<name>.url

Markus