stoyanvi · April 16, 2014 12:58
diff --git a/git-merge-tool b/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
	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