On Tue, Mar 08, 2011 at 01:15:48PM -0500, Richard Hipp wrote: > > > > Is meld more than just a visual 3-way merge tool, like xxdiff or kdiff3? > > > > Can meld be plugged into Fossil using the "gmerge-command" setting? > > > > While we're on the subject, should the gmerge-command setting be extended to > be "smart" about commonly used graphical merges. Should you be able to say > just: > > fossil setting gmerge-command kdiff3 > > and fossil would know to add the "%baseline" "%original" "%merge" -o > "%output" arguments onto the end automatically? Similar automatic arguments > would apply to xxdiff and meld, perhaps? Or is that a case of the software > trying to be too clever?
I think that's too clever. I'd keep fossil simpler. Nevertheless, I recall the 'unison' configuration file, and how it deals with it, as that may be an interesting reference: http://www.cis.upenn.edu/~bcpierce/unison/download/releases/stable/unison-manual.html#merge Regards, Lluís. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
