aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-11 13:27:05 -0700
committerJunio C Hamano <gitster@pobox.com>2017-08-11 13:27:05 -0700
commita449130a003934cb40738a2bf8c1a653afcd2e22 (patch)
treee049ed60e42ac167b010053f7e81f49944bf666e /builtin/fmt-merge-msg.c
parentMerge branch 'ah/doc-wserrorhighlight' (diff)
parentfmt-merge-msg: fix coding style (diff)
downloadgit-a449130a003934cb40738a2bf8c1a653afcd2e22.tar.gz
git-a449130a003934cb40738a2bf8c1a653afcd2e22.zip
Merge branch 'dc/fmt-merge-msg-microcleanup'
Code cleanup. * dc/fmt-merge-msg-microcleanup: fmt-merge-msg: fix coding style
Diffstat (limited to 'builtin/fmt-merge-msg.c')
-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 = "";