I have noticed that at least some other SCMs provide a mechanism for using an external merge tool. Unless I am misunderstanding the descriptions of the diff-command and gdiff-command settings, Fossil appears to not have a setting for an external merge tool.
On Sun, Feb 20, 2011 at 1:56 PM, Matt Welland <[email protected]> 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 [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
