Re: merge strategy request

On Sat, 24 Mar 2007, Linus Torvalds wrote:

On Sun, 25 Mar 2007, Johannes Schindelin wrote:

quoted

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.

right, I can see ways to further improve the merge for config files, but they 
wouldn't applty to most other types of files, so it would require support for 
per file merge options.

others have requested this in the past, this is just one more way that per-file 
merge options would be useful.

David Lang