I think BBEdit is the tool you are looking for: You can check diffmerge: Maybe, the easiest way is to use opendiff from the Xcode package. Type in Terminal: opendiff my_file1.m my_file2.m It's in Xcode.app/Contents/Develop er/usr/bin in you have the latest Xcode. (You may need to launch: sudo /usr/bin/xcode-select -switch /Applications/Xcode.app/Co ntents/Dev eloper) before for Xcode 4.3). In Xcode you find FileMerge tool too: in the main menu Xcode->Open Developer->File Merge The app is in Xcode.app/Contents/Applica tions.

Sourcetree is a free Git client for Windows and Mac. Download for Mac OS X. Learn Git through comprehensive tutorials covering branching, merging and more. Get clean and clear commits with Sourcetree's interactive rebase tool. Visual Merge Tool and Diff Tool for Designers and Developers Alike. Recognize line-ending conventions for Windows (CRLF), Mac (CR), and Unix (LF). A valuable tool for diagnosing Continuous Integration bugs, Folder Diff also measures how much code must be resolved in pending.

This tutorial is made for you if • you use a source control system like Git or Github • you use Sourcetree a the UI client to work with your repositories • you have to merge changes in your various branches • you have to solve conflicts when merging Today I asked myself: how to use an external Diff/Merge tool in Sourcetree? When you open the options of Sourcetree you will find the section for defining an external tool deactivated like this: As external tools are defined for Git and not for Sourcetree you have to allow Sourcetree itself to modify the.gitconfig file to use an external editor. How to compress a pdf file on a mac for email. You can find this important setting in the first tab of the options: I chose DiffMerge as the external tool to view, merge and save the files that conflicted during the merge of separate branches. You can download it for free here: Once you allowed Sourcetree to set the external tool in the Git config you are able to choose it from the list of tools: As this tool is known by Sourcetree no additional configuration for the command line is necessary. So if you ever face a conflict while merging a branch into your own you can chose DiffMerge as the external tool to do it.