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. _______________________________________________ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
