From: John Keeping <john@keeping.me.uk>
Date: Sun, 27 Jan 2013 22:54:23 GMT
Subject: Re: [PATCH 4/4] doc: Generate a list of valid merge tools
Message-ID: <20130127225423.GW7498@serenity.lan>
In-Reply-To: <1359321886-80523-5-git-send-email-davvid@gmail.com>

On Sun, Jan 27, 2013 at 01:24:46PM -0800, David Aguilar wrote:
> --- a/git-mergetool--lib.sh
> +++ b/git-mergetool--lib.sh
> @@ -1,5 +1,6 @@
>  #!/bin/sh
>  # git-mergetool--lib is a library for common merge tool functions
> +test -z "$MERGE_TOOLS_DIR" &&
>  MERGE_TOOLS_DIR=$(git --exec-path)/mergetools

The preferred pattern in Git seems to be this:

    : ${MERGE_TOOLS_DIR=$(git --exec-path)/mergetools}


John