From babf5765da3e328cc1060cb9b37fbdeb6fd58350 Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <byronimo@gmail.com>
Date: Wed, 21 Oct 2009 16:52:25 +0200
Subject: Initial version of merge including tests for one-way, two-way and
 tree-way merge

---
 lib/git/errors.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/git/errors.py')

diff --git a/lib/git/errors.py b/lib/git/errors.py
index e9a637c0..18c58073 100644
--- a/lib/git/errors.py
+++ b/lib/git/errors.py
@@ -27,6 +27,6 @@ class GitCommandError(Exception):
 		self.command = command
 
 	def __str__(self):
-		return repr("%s returned exit status %d" %
-					(str(self.command), self.status))
+		return repr("'%s' returned exit status %d: %r" %
+					(' '.join(self.command), self.status, str(self.stderr)))
 
-- 
cgit v1.2.1