On 04/12/2010 12:52 PM, D. Richard Hipp wrote: > Can anyone suggest a good 3-way graphical merger that I can use for > testing (Mac or Linux).
http://kdiff3.sourceforge.net/ KDiff3 can be used to merge two or three input files and automatically merges as much as possible. The result is presented in an editable window where most conflicts can be solved with a single mouseclick: Select the buttons A/B/C from the button-bar to select the source that should be used. You can also select more than one source. Since this output window is an editor even conflicts which need further corrections can be solved here without requiring another tool. Free as in speech and beer (GPLv2). Supported platforms: * GNU/Linux with KDE3, KDE4 (from 0.9.93 on), * Any Un*x that is supported by the Qt-libs from Trolltech, * MS-Windows. * Apple Mac OSX binary available. (0.9.95) * In theory any platform for which Qt-libs work. Command line use doc: http://kdiff3.sourceforge.net/doc/documentation.html#id2488370 -- Daniel JB Clark | http://pobox.com/~dclark | Activist; Owner \|/ FREEDOM -+-> INCLUDED ~ http://freedomincluded.com /|\ Free Software respecting hardware ~ Lemote Yeeloong reseller _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
