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>

diff --git a/stgit/stack.py b/stgit/stack.py
index 3468547..b6f6131 100644 (file)
--- 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".',
                 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)
 
 
         append_string(self.__applied_file, name)