summaryrefslogtreecommitdiff
path: root/merge-cache.c
diff options
context:
space:
mode:
authorAlexey Nezhdanov <snake@penza-gsm.ru>2005-05-19 11:17:16 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-19 17:52:00 (GMT)
commit667bb59b2d5b0a2e7fca5970d6f757790a6edd74 (patch)
tree099b568160ec8ad8cbae5c22b61abe69a82d6546 /merge-cache.c
parent9669e17a2f79e8ef0bd5981f8178cada5e53d46b (diff)
downloadgit-667bb59b2d5b0a2e7fca5970d6f757790a6edd74.zip
git-667bb59b2d5b0a2e7fca5970d6f757790a6edd74.tar.gz
git-667bb59b2d5b0a2e7fca5970d6f757790a6edd74.tar.bz2
[PATCH] cleanup of in-code names
Fixes all in-code names that leaved during "big name change". Signed-off-by: Alexey Nezhdanov <snake@penza-gsm.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'merge-cache.c')
-rw-r--r--merge-cache.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/merge-cache.c b/merge-cache.c
index 4841233..37c72d2 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);
}