automatic merging of "set of lines" text files with a specific git merge driver (union?)

seanh snhmnd at
Tue Feb 22 14:33:44 CET 2011

On Mon, Feb 21, 2011 at 09:24:16PM +0100, Dieter Plaetinck wrote:
> hmm according to `man git`, it supports patience diff as option for the recursive strategy (which is default for 3-way merges)
> in other words:
> `git merge -X patience` should work.
> or branch.recursive.mergeoptions=patience
> I'll experiment a bit more..

Really? I don't see that it man git. That would be great though.

More information about the vcs-home mailing list