Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Start 1.6.2.3 preparation
[gitweb.git]
/
merge-index.c
diff --git
a/merge-index.c
b/merge-index.c
index c00a2b385a3373f88b9fd3f087d9681cdc46cbf6..aa9cf23a39ae271a53d1a0c05ac99be0e832b46a 100644
(file)
--- a/
merge-index.c
+++ b/
merge-index.c
@@
-92,7
+92,7
@@
int main(int argc, char **argv)
signal(SIGCHLD, SIG_DFL);
if (argc < 3)
- usage("git
-
merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
+ usage("git
merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
git_extract_argv0_path(argv[0]);