Skip to content

Instantly share code, notes, and snippets.

@coderxin
Created May 23, 2013 17:14
Show Gist options
  • Save coderxin/5637731 to your computer and use it in GitHub Desktop.
Save coderxin/5637731 to your computer and use it in GitHub Desktop.
How to set Sublime Text 2 as Git merge tool? https://coderwall.com/p/fypiga
git config --global mergetool.sublime.cmd "subl -w \$MERGED"
git config --global mergetool.sublime.trustExitCode false
git config --global merge.tool sublime
git mergetool -y
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment