From f0b5d4dd2a3ad665a5bbaedf84bfb7c240831da4 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Thu, 21 Jun 2007 23:04:49 +0100 Subject: [PATCH] Pass a string rather than an exception object in gitmergeonefile Signed-off-by: Catalin Marinas --- stgit/gitmergeonefile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stgit/gitmergeonefile.py b/stgit/gitmergeonefile.py index 303e5f7..5e51b8a 100644 --- 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) -- 2.11.4.GIT