From: Chris Packham <judge.packham@gmail.com>
Date: Sun, 27 Feb 2011 05:50:32 GMT
Subject: Re: [PATCH 3/3] mergetool--lib: Add the proper executable name for ECMerge
Message-ID: <4D69E628.5040007@gmail.com>
In-Reply-To: <4D68DBB0.2020909@gmail.com>

On 26/02/11 23:53, Sebastian Schuberth wrote:
> Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
> ---
>  git-mergetool--lib.sh |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> index 3ac6231..95da00b 100644
> --- a/git-mergetool--lib.sh
> +++ b/git-mergetool--lib.sh
> @@ -16,6 +16,9 @@ translate_merge_tool_path () {
>  	bc3)
>  		echo BCompare
>  		;;
> +	ecmerge)
> +		echo guimerge
> +		;;
>  	emerge)
>  		echo emacs
>  		;;

I think this is another case of linux/windows versions of the
application having different executable names.

chrisp@laptop:~> tar -tf Download/ecmerge-2.3.123.linux.x86.tbz
/usr/local/bin/ecmerge
/opt/elliecomputing/ecmerge/guimerge
/opt/elliecomputing/ecmerge/guimerge.exe