
FileMerge
FileMerge is part of Xcode . FileMerge lets you compare one file to another or one directory to another. For a more accurate comparison, you can compare two files or directories to a common ancestor. After comparing, you can merge the files or directories together.