On Mon, Feb 21, 2011 at 08:23:42AM -0500, Richard Hipp wrote: > Just to clearify, by "3-way merge", you mean a graphical merging tool? I > ask because Fossil always has done a 3-way merge behind the scenes - it just > doesn't show you what it is doing or give you the opportunity to intervene.
I imagine he refers to add the possibility of launching the user favourite 3-way-merge program in case of conflicts, to avoid the laterresolution through '<<<' marks. > On Sun, Feb 20, 2011 at 1:56 PM, Matt Welland <estifo...@gmail.com> wrote: > > > I saw a prior thread on this topic but I am not clear on if any action was > > planned. Not sure yet why but I'm getting a lot more merge conflicts than I > > did with Monotone. If nothing is being worked on I'll make a perl script > > helper as fixing merges by editing the files with markers is really tedious. > > FYI, my preferred three way merge tool is kdiff3 with xxdiff being a close > > follower. > > > > _______________________________________________ > > fossil-users mailing list > > fossil-users@lists.fossil-scm.org > > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > > > > > > > -- > D. Richard Hipp > d...@sqlite.org > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
