Skip to content

Instantly share code, notes, and snippets.

@ianmcnally

ianmcnally/sublime_as_mergetool.txt

Created June 30, 2014 17:31
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ianmcnally/b81935cda16874a8ce47 to your computer and use it in GitHub Desktop.
Save ianmcnally/b81935cda16874a8ce47 to your computer and use it in GitHub Desktop.
Download ZIP
Sublime text as merge tool
Raw
sublime_as_mergetool.txt
git config --global mergetool.sublime.cmd "subl -w \$MERGED"
git config --global mergetool.sublime.trustExitCode false
git config --global merge.tool sublime
Usage:
git mergetool -y
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment