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@xxxxxxxxx>
Acked-by: Karl Hasselström <kha@xxxxxxxxxxx>
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
