Skip to content

Monthly Archives: March 2012

Visual merge with Git on Mac OS X

Mac developer tools have a tool include called FileMerge + a command line based tool called opendiff to invoke it, to use this tool in Git, run this command: git config –global merge.tool opendiff then when you want to do a merge you can just use the command: git mergetool Easy and simple, the things [...]