Created
June 2, 2023 20:43
-
-
Save balcsida/82d4e5d3690f3978ca663d1ee4ec5f8d to your computer and use it in GitHub Desktop.
Set Sublime Merge as default git merge tool
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.smerge.cmd 'smerge mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"' | |
| git config --global mergetool.smerge.trustExitCode true | |
| git config --global merge.tool smerge |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment