Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
add boolean diff.suppress-blank-empty config option
[gitweb.git]
/
builtin-fmt-merge-msg.c
diff --git
a/builtin-fmt-merge-msg.c
b/builtin-fmt-merge-msg.c
index dbd7d2ddae2d4b44bcccf9977d435cf334a0c418..df02ba7afdd615492361a1897a9dedd6ab233c96 100644
(file)
--- a/
builtin-fmt-merge-msg.c
+++ b/
builtin-fmt-merge-msg.c
@@
-6,7
+6,7
@@
#include "tag.h"
static const char *fmt_merge_msg_usage =
- "git
-
fmt-merge-msg [--log] [--no-log] [--file <file>]";
+ "git
fmt-merge-msg [--log] [--no-log] [--file <file>]";
static int merge_summary;