Skip to content

Instantly share code, notes, and snippets.

@stoyanvi

stoyanvi/git-merge-tool

Forked from coderxin/git-merge-tool
Created April 16, 2014 12:58
Show Gist options
  • Save stoyanvi/10870531 to your computer and use it in GitHub Desktop.
Save stoyanvi/10870531 to your computer and use it in GitHub Desktop.
Download ZIP
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