Skip to content

Instantly share code, notes, and snippets.

@coderxin

coderxin/git-merge-tool

Created May 23, 2013 17:14
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save coderxin/5637731 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save coderxin/5637731 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. Andrew Eisaks created this gist May 23, 2013.
    5 changes: 5 additions & 0 deletions git-merge-tool
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,5 @@
    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