Re: [PATCH] builtin-merge: allow using a custom strategy

Hi,

On Tue, 29 Jul 2008, Miklos Vajna wrote:

On Mon, Jul 28, 2008 at 03:06:09PM +0200, Johannes Schindelin 
[off-list ref] wrote:

quoted

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...

Right. I just squashed patch 4 and 5, and this solves the problem: patch 
3 changes the signature and fixes all usage (in help.c, it's not used 
outside help.c), then the squashed patch introduces the usage of the new 
list_commands() in builtin-merge.c.

Thanks,
Dscho