On 2014-06-26 20:36, Václav Valíček wrote: > mergetool command). If you use meld, I can suggest --auto-merge (or > --auto-compare - not sure). It is perfect timesaver.
Beyond Compare is another brilliant tool for 3-way merges and anything else you need to diff (files, images, registry, directories etc). Regards, - Graeme - -- fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal http://fpgui.sourceforge.net/ -- _______________________________________________ Lazarus mailing list [email protected] http://lists.lazarus.freepascal.org/mailman/listinfo/lazarus
