From: Karl Hasselström <kha@treskal.com>
Date: Thu, 04 Dec 2008 09:30:11 GMT
Subject: Re: [StGit PATCH] Print conflict details with the new infrastructure (bug #11181)
Message-ID: <20081204093011.GA25060@diana.vm.bytemark.co.uk>
In-Reply-To: <20081203213813.9924.62751.stgit@localhost.localdomain>

On 2008-12-03 21:38:13 +0000, Catalin Marinas wrote:

> The patch modifies the IndexAndWorkTree.merge() function to display
> pass the conflict information (files) when raising an exception. The
> logic is similar to the one in the old infrastructure.

Looks good. Thanks.

> Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

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

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