X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=merge-cache.c;h=37c72d26ca587bd700412cd9d7cd99b08fd2da3a;hb=d6db01075b65da2b8584a0450619390893aae103;hp=48412330cb950813b37d7254947a3f70a4fd99d8;hpb=2a45925180152b3e54248de4d7f69e8cc5c4051f;p=git.git

diff --git a/merge-cache.c b/merge-cache.c
index 48412330..37c72d26 100644
--- a/merge-cache.c
+++ b/merge-cache.c
@@ -39,7 +39,7 @@ static int merge_entry(int pos, const char *path)
 	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] = "";
@@ -64,7 +64,7 @@ static int merge_entry(int pos, const char *path)
 		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;
 }
@@ -97,7 +97,7 @@ int main(int argc, char **argv)
 	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();
 
@@ -118,7 +118,7 @@ int main(int argc, char **argv)
 				merge_all();
 				continue;
 			}
-			die("merge-cache: unknown option %s", arg);
+			die("git-merge-cache: unknown option %s", arg);
 		}
 		merge_file(arg);
 	}