Merge branch 'dc/fmt-merge-msg-microcleanup' into maint

gitster · gitster · commit de55703672ea · 2017-08-23T14:33:52.000-07:00
Code cleanup.

* dc/fmt-merge-msg-microcleanup:
  fmt-merge-msg: fix coding style
diff --git 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 = "";
 

Original file line number	Diff line number	Diff line change
`@@ -408,7 +408,8 @@ static void shortlog(const char *name,`
`408`	`408`	`}`
`409`	`409`
`410`	`410`	`static void fmt_merge_msg_title(struct strbuf *out,`
`411`		`- const char *current_branch) {`
	`411`	`+ const char *current_branch)`
	`412`	`+{`
`412`	`413`	`int i = 0;`
`413`	`414`	`char *sep = "";`
`414`	`415`