diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-09-03 14:51:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 14:51:56 -0700 |
| commit | 36f44a06802960abce7febbf9cc40461e5546ee5 (patch) | |
| tree | d0001f04f2edfb3644c304626908f31d495cb17b /merge-index.c | |
| parent | 73bae1dc468734bad3ff7d1b8e93e7ac5f9d3dff (diff) | |
| parent | 47a528ad24185133867ebb5bb7692db2cb8bef39 (diff) | |
| download | git-36f44a06802960abce7febbf9cc40461e5546ee5.tar.gz | |
Merge branch 'ho/dashless' into maint
* ho/dashless:
tests: use "git xyzzy" form (t7200 - t9001)
tests: use "git xyzzy" form (t7000 - t7199)
tests: use "git xyzzy" form (t3600 - t6999)
tests: use "git xyzzy" form (t0000 - t3599)
'git foo' program identifies itself without dash in die() messages
Start conforming code to "git subcmd" style
Diffstat (limited to 'merge-index.c')
| -rw-r--r-- | merge-index.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/merge-index.c b/merge-index.c index 7491c56ad2..7827e87a92 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); } |