Skip to content

Instantly share code, notes, and snippets.

@coderxin

coderxin/git-merge-tool

Created May 23, 2013 17:14
Show Gist options
  • Star 3 You must be signed in to star a gist
  • Fork 3 You must be signed in to fork a gist
  • Save coderxin/5637731 to your computer and use it in GitHub Desktop.
Save coderxin/5637731 to your computer and use it in GitHub Desktop.
Download ZIP
How to set Sublime Text 2 as Git merge tool? https://coderwall.com/p/fypiga
Raw
git-merge-tool
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