From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 28 Jul 2008 13:06:09 GMT
Subject: Re: [PATCH 5/6] builtin-merge: avoid non-strategy git-merge commands in error message
Message-ID: <alpine.DEB.1.00.0807281505010.2725@eeepc-johanness>
In-Reply-To: <42e8615f6cbd236e40b19f2a754807f08e4b85a6.1217207602.git.vmiklos@frugalware.org>

Hi,

On Mon, 28 Jul 2008, Miklos Vajna wrote:

> -		list_commands("git-merge-", "strategies");
> +		list_commands("git-merge-", "strategies", &not_strategies);

The change in the signature of list_commands() is not part of this patch.  
So at least one of your commits should result in an uncompileable 
revision...

Ciao,
Dscho