On Wed, 18 Apr 2007, Martin Waitz wrote: > > > [merge.driver] > > ancient = merge %A %O %B > > or > > [merge "ancient"] > driver = merge %A %O %B Much better. That format also allows you to add extra flags if you want. For example, it might be useful to add something like [merge "ancient"] name = external three-way merge driver = merge %A %O %B so that you could make the merge process actually say what it is doing when it's merging things. Wouldn't it be nice to see merging file xyzzy using external three-way merge merging file fax.doc using word file merge .. when these things trigger? So even if we do *not* care about the name, this kind of config structure is just more flexible. Linus - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html