From: Karl Hasselström <kha@treskal.com>
Date: Wed, 19 Dec 2007 18:00:12 +0000 (+0000)
Subject: Better error message if merge fails
X-Git-Tag: v0.15-rc1~334
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/a008f844a95a45267933e23c6cda31f430b70ba6?hp=a008f844a95a45267933e23c6cda31f430b70ba6

Better error message if merge fails

This message is no longer printed in case of conflicts, just in case
the merge really failed; so don't talk about conflicts in the error
message.

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