On Tue, Mar 08, 2011 at 01:12:22PM -0500, Richard Hipp wrote: > On Tue, Mar 8, 2011 at 12:44 PM, Jan Danielsson > <jan.m.daniels...@gmail.com>wrote: > > > Hello, > > > > Anyone here using meld[1]? > > > > When merging with many conflicts I find meld to be of invaluable > > help, though I noticed that meld is missing explicit fossil-support. > > > > Is meld more than just a visual 3-way merge tool, like xxdiff or kdiff3?
I've never used it for 3-way merge; for me it's like an editor with two files asside and its diff graphically. Something like a more graphical vimdiff, with mouse control and all that. I use it as it has a comfortable directory diff, quick merging by mouse, and an acceptable editor for any new text I may have to type. In fact, I use to review branches using meld, but setting one directory with a fossil checkout of the branch leaf, and then another directory with the pivot to the branch I want to merge to. Then I run "meld" between the two directories. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
