On Apr 12, 2010, at 09:52:37 PDT, D. Richard Hipp wrote: > Can anyone suggest a good 3-way graphical merger that I can use for > testing (Mac or Linux).
For Mac, assuming you have the developer tools installed, there is / usr/bin/opendiff (see man opendiff). If you have PIVOT, INPUT1, INPUT2 and OUTPUT files you can do: opendiff INPUT1 INPUT2 -ancestor PIVOT -merge OUTPUT Unfortunately that does not wait for FileMerge to exit. opendiff has a semi-documented feature that will make it wait for FileMerge to exit -- if you pipe the output somewhere (redirection is not good enough) it waits for FileMerge to exit, so using the following variation will wait for FileMerge to exit (which is probably what fossil needs): opendiff INPUT1 INPUT2 -ancestor PIVOT -merge OUTPUT | cat I'm not saying FileMerge is the best out there, but it is installed (along with opendiff) whenever the developer tools are installed for Mac OS X and you can't really compile without installing them, so FileMerge/opendiff is likely present on Mac OS X whenever the compiler is present. FYI, when you add -ancestor, you get the following behavior (from FileMerge help): > If you specify an ancestor file, some differences may be highlighted > in red as well. This means that both the left file and the right > file differ from the ancestor. You must resolve such conflicts by > hand. Kyle _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
