Re: [StGit PATCH] Print conflict details with the new infrastructure (bug #11181)
flat view
From: Karl Hasselström <hidden>
Date: 2016-06-15 22:45:44
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 <redacted>
Acked-by: Karl Hasselström <redacted>
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle