On 03/08/11 19:12, Richard Hipp wrote: [---] >> 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?
It's mostly a diff/merge-tool (file and directories). But in addition it has some basic interfaces to VCS's. The GUI allows one to revert files, commit files, etc. I don't use those features very frequently, but sometimes it's convenient to have them there when I'm anyway sorting through diffs in meld. > Can meld be plugged into Fossil using the "gmerge-command" setting? Yes, I just tried it, and it works fine. Could someone add this to the list of examples for gmerge-command at http://www.fossil-scm.org/fossil/help/setting: meld %baseline %original %merge %output .. ? Caveats: - The "meld --help" stipulates that there's an "-o" or "--output" to specify output file, but it it appears to be a nop. (Though perhaps I'm misunderstanding how it's supposed to work). Simply passing %output as a fourth argument seems to do the trick. (I used meld HEAD (cloned from their git yesterday) for these tests). - Some Random Web Page stipulates that meld version 1.4 or later is required for the output argument. -- Kind regards, Jan Danielsson
signature.asc
Description: OpenPGP digital signature
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
