From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Wed, 3 Dec 2008 21:49:23 +0000 (+0000)
Subject: Print conflict details with the new infrastructure (bug #11181)
X-Git-Tag: v0.15-rc1~62^2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/a79cd5d5eb048bdd9e78d096f7f2cbf923d85eca?hp=a79cd5d5eb048bdd9e78d096f7f2cbf923d85eca

Print conflict details with the new infrastructure (bug #11181)

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.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Acked-by: Karl Hasselström <kha@treskal.com>
---