Re: [PATCH 2] Add default merge options for all branches

[Miklos Vajna <vmiklos@xxxxxxxxxxxxxx>]

On Mon, May 02, 2011 at 02:23:49PM -0500, Michael Grubb <devel@xxxxxxxxxxxxx> wrote:
>  		if (argc < 0)
> -			die(_("Bad branch.%s.mergeoptions string: %s"), branch,
> -			    split_cmdline_strerror(argc));
> +		{
> +			if (merge_option_mode == 1)

checkpatch.pl from the kernel tree may help you - { belongs to the end
of the previous line.

Thanks.

Attachment: pgpKhr9QX_fCU.pgp
Description: PGP signature