diff --git a/merge-cache.c b/merge-cache.c
index 48412330cb950813b37d7254947a3f70a4fd99d8..37c72d26ca587bd700412cd9d7cd99b08fd2da3a 100644 (file)
--- a/merge-cache.c
+++ b/merge-cache.c
int found;
if (pos >= active_nr)
- die("merge-cache: %s not in the cache", path);
+ die("git-merge-cache: %s not in the cache", path);
arguments[0] = pgm;
arguments[1] = "";
arguments[2] = "";
arguments[stage + 4] = ownbuf[stage];
} while (++pos < active_nr);
if (!found)
- die("merge-cache: %s not in the cache", path);
+ die("git-merge-cache: %s not in the cache", path);
run_program();
return found;
}
int i, force_file = 0;
if (argc < 3)
- usage("merge-cache [-o] <merge-program> (-a | <filename>*)");
+ usage("git-merge-cache [-o] <merge-program> (-a | <filename>*)");
read_cache();
merge_all();
continue;
}
- die("merge-cache: unknown option %s", arg);
+ die("git-merge-cache: unknown option %s", arg);
}
merge_file(arg);
}