Skip to content

Instantly share code, notes, and snippets.

@ivankristianto

ivankristianto/git-merge-with-sublime

Created August 16, 2013 08:54
Show Gist options
  • Save ivankristianto/6248339 to your computer and use it in GitHub Desktop.
Save ivankristianto/6248339 to your computer and use it in GitHub Desktop.
Download ZIP
Git merge tools with Sublime 2
Raw
git-merge-with-sublime
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