X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/a6b4d2b579bded5f7117ae1fe61f7ee9e6e89c49..547eb28f9892547a2ac7a29221582074e7ba0103:/stgit/git.py

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):