From: Miklos Vajna <vmiklos@frugalware.org>
Date: Mon, 02 May 2011 22:47:35 GMT
Subject: Re: [PATCH 2] Add default merge options for all branches
Message-ID: <20110502224735.GU21056@genesis.frugalware.org>
In-Reply-To: <4DBF04C5.1080608@dailyvoid.com>

On Mon, May 02, 2011 at 02:23:49PM -0500, Michael Grubb <devel@dailyvoid.com> 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.