From a008f844a95a45267933e23c6cda31f430b70ba6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Karl=20Hasselstr=C3=B6m?= <kha@treskal.com>
Date: Wed, 19 Dec 2007 18:00:12 +0000
Subject: [PATCH] Better error message if merge fails
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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>
---
 stgit/stack.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/stgit/stack.py b/stgit/stack.py
index 3468547..b6f6131 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -1109,8 +1109,7 @@ class Series(PatchSet):
                 ex.list()
             except git.GitException, ex:
                 out.error('The merge failed during "push".',
-                          'Use "refresh" after fixing the conflicts or'
-                          ' revert the operation with "push --undo".')
+                          'Revert the operation with "push --undo".')
 
         append_string(self.__applied_file, name)
 
-- 
2.11.0