X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-index.c;h=7827e87a928586226570132fc8922991b1cb6c8a;hb=a5a5a04863036678919705979b9c0f3579fa3710;hp=7491c56ad25332fb4aae6a075bf0577a1d800c3b;hpb=77ad7a49d3cc946487ca759e5361effbcfb03be5;p=git.git

diff --git a/merge-index.c b/merge-index.c
index 7491c56ad..7827e87a9 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -27,7 +27,7 @@ static int merge_entry(int pos, const char *path)
 	int found;
 
 	if (pos >= active_nr)
-		die("git-merge-index: %s not in the cache", path);
+		die("git merge-index: %s not in the cache", path);
 	arguments[0] = pgm;
 	arguments[1] = "";
 	arguments[2] = "";
@@ -53,7 +53,7 @@ static int merge_entry(int pos, const char *path)
 		arguments[stage + 4] = ownbuf[stage];
 	} while (++pos < active_nr);
 	if (!found)
-		die("git-merge-index: %s not in the cache", path);
+		die("git merge-index: %s not in the cache", path);
 	run_program();
 	return found;
 }
@@ -117,7 +117,7 @@ int main(int argc, char **argv)
 				merge_all();
 				continue;
 			}
-			die("git-merge-index: unknown option %s", arg);
+			die("git merge-index: unknown option %s", arg);
 		}
 		merge_file(arg);
 	}