From: Chuck Lever <cel@netapp.com>
Date: Wed, 26 Oct 2005 18:51:43 +0000 (-0400)
Subject: Fix exception error message in git.merge()
X-Git-Tag: v0.8~51
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/547eb28f9892547a2ac7a29221582074e7ba0103

Fix exception error message in git.merge()

Due to recent big git script rename.

Signed-off-by: Chuck Lever <cel@netapp.com>
---

diff --git a/stgit/git.py b/stgit/git.py
index 69b1d33..d5bd724 100644
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -464,7 +464,7 @@ def merge(base, head1, head2):
 
     # this can fail if there are conflicts
     if os.system('git-merge-index -o -q gitmergeonefile.py -a') != 0:
-        raise GitException, 'git-merge-cache failed (possible conflicts)'
+        raise GitException, 'git-merge-index failed (possible conflicts)'
 
 def status(files = [], modified = False, new = False, deleted = False,
            conflict = False, unknown = False, noexclude = False):