From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Sun, 03 May 2009 06:54:27 GMT
Subject: Re: [PATCH] mergetool--lib: add support for araxis merge
Message-ID: <200905030854.28059.markus.heidelberg@web.de>
In-Reply-To: <1241313481-17923-1-git-send-email-davvid@gmail.com>

David Aguilar, 03.05.2009:
> This patch is a result of the discussion on the msysgit list:
> 
> http://groups.google.com/group/msysgit/browse_thread/thread/fa353fa2240594d7
> 
> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> @@ -263,6 +266,23 @@ run_merge_tool () {
>  			status=1
>  		fi
>  		;;
> +	araxis)
> +		if merge_mode; then
> +			if $base_present; then

			touch "$BACKUP"

> +				"$merge_tool_path" -wait -merge -3 -a1 \
> +					"$BASE" "$LOCAL" "$REMOTE" "$MERGED" \
> +					>/dev/null 2>&1
> +			else
> +				"$merge_tool_path" -wait -2 \
> +					"$LOCAL" "$REMOTE" "$MERGED" \
> +					>/dev/null 2>&1
> +			fi
> +			check_unchanged
> +		else
> +			"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" \
> +				>/dev/null 2>&1
> +		fi
> +		;;
>  	*)
>  		merge_tool_cmd="$(get_merge_tool_cmd "$1")"
>  		if test -z "$merge_tool_cmd"; then

Haven't you included the -title[1-3] command line switches because of
the strange "'title'" format? The user on the msysgit list had commented
it out in his patch, although he said it worked in this way. And looking
at git-gui/lib/mergetool.tcl, it is done in the same way.

Markus