Skip to content

Instantly share code, notes, and snippets.

@acofer

acofer/git-merge-tool

Forked from coderxin/git-merge-tool
Last active August 29, 2015 14:27
Show Gist options
  • Save acofer/cfd17f22c3fed18b3738 to your computer and use it in GitHub Desktop.
Save acofer/cfd17f22c3fed18b3738 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