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 69b1d33d5a71f8be85721fadaa972b9d336a4427..d5bd724cd6e7dd3aaddce9e7b19f02710f9060e3 100644 (file)
--- 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:
 
     # 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):
 
 def status(files = [], modified = False, new = False, deleted = False,
            conflict = False, unknown = False, noexclude = False):