Skip to content

Instantly share code, notes, and snippets.

View ankbul's full-sized avatar

Ankur Bulsara ankbul

View GitHub Profile
@ankbul
ankbul / howto-filemerge-git-osx.md
Created May 14, 2012 19:16 — forked from bkeating/howto-filemerge-git-osx.md
HOWTO: Using FileMerge (opendiff) with Git on OSX

HOWTO: Using FileMerge (opendiff) with Git on OSX

FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.

The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.