James Huang james-huang
andyshora
/ sublime-merge-tool.sh
Created
April 9, 2014 13:39
Set Sublime Text 2 as the default Git merge tool to resolve conflicts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ln -s "/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl" ~/bin/subl | |
| git config --global mergetool.sublime.cmd "sublime -w \$MERGED" | |
| git config --global mergetool.sublime.trustExitCode false | |
| git config --global merge.tool sublime |