On Sun, 25 Mar 2007, Johannes Schindelin wrote: > > Basically, just write a program named "git-merge-david-lang", which takes > arguments of the form > > merge-base [merge-base2...] -- head remote [remote...] I think you are missing what David wants. David does *not* want a new global strategy. Adding those is fairly easy. David seem sto want a new per-file merge strategy, with the bog-standard recursive merge. We've talked about that possibility in the past, but we don't do it now. We always end up doing just the three-way merge. 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