The contents of the file will look like this: #!/bin/sh I keep mine in the following location: vim ~/bin/git-diff.sh
To set FileMerge as your git diff tool, first create a simple script that will be the translator between git and the FileMerge utility. To see a visual diff of two files, run opendiff file1 file2 in your terminal, and a GUI app will appear. You can dig around the Xcode.app directory until you find it, although the command opendiff should already exist in your terminal. 1 min read Multithreaded JavaScript, O'Reilly 2021, is available for early access and pre-order!Īre you unhappy with the command line diff tools provided by git? If so, this tutorial is for you.įileMerge is a utility that comes with OS X / Xcode, although it is hidden and not the easiest to get to.
