From: David Kågedal <david@virtutech.com>
Date: Wed, 19 Dec 2007 18:00:12 +0000 (+0000)
Subject: Use the output from merge-recursive to list conflicts
X-Git-Tag: v0.15-rc1~337
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/6c76a03347dca249ac12f791d6321ff15889c64a?hp=6c76a03347dca249ac12f791d6321ff15889c64a

Use the output from merge-recursive to list conflicts

merge-recursive already has useful information about what the conflicts
were, so we reuse that when pushing.

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Karl Hasselström <kha@treskal.com>
---