From: Markus Heidelberg <markus.heidelberg@web.de>
Date: Mon, 30 Mar 2009 06:55:09 GMT
Subject: Re: [PATCH 6/8] sh-tools: add a run_merge_tool function
Message-ID: <200903300855.09353.markus.heidelberg@web.de>
In-Reply-To: <1238389428-69328-7-git-send-email-davvid@gmail.com>

David Aguilar, 30.03.2009:
> +		if mergetool_mode; then
> +			base=Baes

Base

> +			local=Local
> +			remote=Remote
> +		else