Adam Cofer acofer
acofer
/ git-merge-tool
Last active
August 29, 2015 14:27
— forked from coderxin/git-merge-tool
How to set Sublime Text 2 as Git merge tool? https://coderwall.com/p/fypiga
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 |