pollen


DiffMerge is an application to visually compare and merge files within Windows, Mac OS X and Linux.

Source: sourcegear.com