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@xxxxxxxxxxx>
---
stgit/stack.py | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/stgit/stack.py b/stgit/stack.py
index 7dc4861..5df42da 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -1080,8 +1080,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)
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
