From: Karl Hasselström <kha@treskal.com>
Date: Tue, 17 Mar 2009 15:29:12 GMT
Subject: Re: [StGit PATCH 1/4] Add mergetool support to the classic StGit infrastructure
Message-ID: <20090317152912.GB10001@diana.vm.bytemark.co.uk>
In-Reply-To: <20090317110853.27748.70157.stgit@pc1117.cambridge.arm.com>

On 2009-03-17 11:08:53 +0000, Catalin Marinas wrote:

> Since Git already has a tool for interactively solving conflicts
> which is highly customisable, there is no need to duplicate this
> feature via the i3merge and i2merge configuration options. The
> user-visible change is that now mergetool is invoked rather than the
> previously customised interactive merging tool.
>
> The stgit.keeporig option is no longer available to be more
> consistent with the Git behaviour.

Acked-by: Karl Hasselström <kha@treskal.com>

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle