summaryrefslogtreecommitdiff
path: root/builtin-mailsplit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-17 00:22:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-17 00:22:50 (GMT)
commit588c038ac690e012a00dcace34fb318449f5ec7c (patch)
treed604d58fdb9d655e784d30b28b157e01eb289621 /builtin-mailsplit.c
parente75bf76f5462af4185d8260f6feecf24dd24a516 (diff)
parent1b1dd23f2d6a707b7077cdf6bc6d4055bd0bfb7d (diff)
downloadgit-588c038ac690e012a00dcace34fb318449f5ec7c.zip
git-588c038ac690e012a00dcace34fb318449f5ec7c.tar.gz
git-588c038ac690e012a00dcace34fb318449f5ec7c.tar.bz2
Merge branch 'sb/dashless'
* sb/dashless: Make usage strings dash-less t/: Use "test_must_fail git" instead of "! git" t/test-lib.sh: exit with small negagive int is ok with test_must_fail Conflicts: builtin-blame.c builtin-mailinfo.c builtin-mailsplit.c builtin-shortlog.c git-am.sh t/t4150-am.sh t/t4200-rerere.sh
Diffstat (limited to 'builtin-mailsplit.c')
-rw-r--r--builtin-mailsplit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-mailsplit.c b/builtin-mailsplit.c
index e8cbe67..13c60c3 100644
--- a/builtin-mailsplit.c
+++ b/builtin-mailsplit.c
@@ -9,7 +9,7 @@
#include "path-list.h"
static const char git_mailsplit_usage[] =
-"git-mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> [<mbox>|<Maildir>...]";
+"git mailsplit [-d<prec>] [-f<n>] [-b] -o<directory> [<mbox>|<Maildir>...]";
static int is_from_line(const char *line, int len)
{