Merge branch 'jc/merge-msg' into next

* jc/merge-msg:
  fmt-merge-msg: do not add excess newline at the end.

git-fmt-merge-msg.perl

@@ -43,6 +43,7 @@ sub current_branch {
 	my $fh;
 	open $fh, '-|', 'git-symbolic-ref', 'HEAD' or die "$!";
 	my ($bra) = <$fh>;
+	chomp($bra);
 	$bra =~ s|^refs/heads/||;
 	if ($bra ne 'master') {
 		$bra = " into $bra";