On Tue, Feb 22, 2011 at 02:39:24PM +0100, Dieter Plaetinck wrote: > On Tue, 22 Feb 2011 13:33:44 +0000 > seanh <snh...@gmail.com> wrote: > > > 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. > > maybe you need to upgrade: > > 14:37:00 dieter@Gi ~ git --version > git version 1.7.4.1 > 14:37:44 dieter@Gi ~ man git-merge | grep -C 1 patience > > patience > With this option, merge-recursive spends a little extra time > to avoid mismerges that sometimes occur due to unimportant matching lines > (e.g., braces from distinct functions). Use this when > the branches to be merged have diverged wildly. See also > git-diff(1) --patience.
Yeah, I'm on 1.7.3. I did check the release notes and they don't seem to mention this change. This is great news! _______________________________________________ vcs-home mailing list vcs-home@lists.madduck.net http://lists.madduck.net/listinfo/vcs-home
