From: Karl Hasselström <kha@treskal.com>
Date: Tue, 17 Mar 2009 15:30:52 GMT
Subject: Re: [StGit PATCH 2/4] Add automatic git-mergetool invocation to the new infrastructure
Message-ID: <20090317153052.GC10001@diana.vm.bytemark.co.uk>
In-Reply-To: <20090317110858.27748.21534.stgit@pc1117.cambridge.arm.com>

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

> This patch adds the IndexAndWorktree.mergetool() function
> responsible for calling 'git mergetool' to interactively solve
> conflicts. The function may also be called from
> IndexAndWorktree.merge() if the standard 'git merge-recursive' fails
> and 'interactive == True'. The 'allow_interactive' parameter is
> passed to Transaction.push_patch() from the functions allowing
> interactive merging.

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

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