X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=gitMergeCommon.py;h=ce9694b15ebe131fea9536dc7b2a0f04d9ceca02;hb=ccfd3e99621f489db4ea37a03be7674adbd03f6e;hp=7e7f317119b4a7082e9151053ad28225f151f1aa;hpb=654291a2acb1c28b884cb9376a0d7eb5f8c090b5;p=git.git

diff --git a/gitMergeCommon.py b/gitMergeCommon.py
index 7e7f3171..ce9694b1 100644
--- a/gitMergeCommon.py
+++ b/gitMergeCommon.py
@@ -46,6 +46,9 @@ class ProgramError(Exception):
         self.progStr = progStr
         self.error = error
 
+    def __str__(self):
+        return self.progStr + ': ' + self.error
+
 addDebug('runProgram')
 def runProgram(prog, input=None, returnCode=False, env=None, pipeOutput=True):
     debug('runProgram prog:', str(prog), 'input:', str(input))