Pass a string rather than an exception object in gitmergeonefile

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/stgit/gitmergeonefile.py b/stgit/gitmergeonefile.py
index 303e5f77e6b55937043ccaafe5e92eb32b77ce0c..5e51b8a9b344a3b36d4f1c47f214d5e2ba35985d 100644 (file)
--- a/stgit/gitmergeonefile.py
+++ b/stgit/gitmergeonefile.py
@@ -199,7 +199,7 @@ def merge(orig_hash, file1_hash, file2_hash,
                             interactive_merge(path)
                         except GitMergeException, ex:
                             # interactive merge failed
-                            out.error(ex)
+                            out.error(str(ex))
                             if str(keeporig) != 'yes':
                                 __remove_files(orig_hash, file1_hash,
                                                file2_hash)
@@ -282,7 +282,7 @@ def merge(orig_hash, file1_hash, file2_hash,
                         interactive_merge(path)
                     except GitMergeException, ex:
                         # interactive merge failed
-                        out.error(ex)
+                        out.error(str(ex))
                         if str(keeporig) != 'yes':
                             __remove_files(orig_hash, file1_hash,
                                            file2_hash)