Configure your new merge tool:
git config --global mergetool.sublime.cmd "subl -w \$MERGED"
git config --global mergetool.sublime.trustExitCode false
git config --global merge.tool sublime
And pro re nata:
git mergetool -y
See also: Just from from viewing in less to editing in Sublime Text 2
This is great, thanks!
I can't get this to work on Windows
@jchannon You must ensure you have subl command in your path that launches sublime text
@jchannon just like @sheerun said you have to make a bash alias for subl on Windows. Then this should work.
Now with your tip I can use git AND code in the same screen. Brilliant!
sublime text 3 will work correct? (OS X Maverick)
@noon-ehos yes st3 works
@jchannon and other windows users, try this for subl from the command line: http://stackoverflow.com/a/9440776/298758