summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-23 14:33:52 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-23 14:33:52 -0700
commitde55703672ea47893702c0bfaffb4788d2eb3818 (patch)
tree8595e3a0784e47a452de673ecd924a207619bd0c /builtin
parentb55b936038ba66233fb765b7b46ed6852dc8fdfb (diff)
parentedd64ef4f7f5e90e66210d375fee1b0ae555cb19 (diff)
downloadgit-de55703672ea47893702c0bfaffb4788d2eb3818.tar.gz
Merge branch 'dc/fmt-merge-msg-microcleanup' into maint
Code cleanup. * dc/fmt-merge-msg-microcleanup: fmt-merge-msg: fix coding style
Diffstat (limited to 'builtin')
-rw-r--r--builtin/fmt-merge-msg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 10cbb43416..e99b5ddbf9 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -408,7 +408,8 @@ static void shortlog(const char *name,
}
static void fmt_merge_msg_title(struct strbuf *out,
- const char *current_branch) {
+ const char *current_branch)
+{
int i = 0;
char *sep = "";