在WINDOWS下面有BEYOND COMPARE,MAC下就用diffmerge吧,
引用官网一句“ DiffMerge is an application to visually compare and merge files within Windows, Mac OS X and Linux.”
地址: http://www.sourcegear.com/diffmerge/
引用官网一句“ DiffMerge is an application to visually compare and merge files within Windows, Mac OS X and Linux.”
地址: http://www.sourcegear.com/diffmerge/