Re: [PATCH] mergetool--lib: add support for araxis merge

From: David Aguilar <davvid@gmail.com>
Date: May 3, 2009, 18:20 UTC
Message-ID: <20090503182040.GB50640@gmail.com>
In-Reply-To: <200905030854.28059.markus.heidelberg@web.de>

Show 23 quoted lines

> David Aguilar, 03.05.2009:
> > +				"$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
> > +		;;
> 
> 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
>

I can resend with the title stuff. I didn't include it since it was commented out in the original patch.

-- 
		David