Skip to content

Instantly share code, notes, and snippets.

@mrmorris

mrmorris/gist:a4aee2f00a4834ccedefd1a4b05383fb

Created February 7, 2019 22:38
Show Gist options
  • Save mrmorris/a4aee2f00a4834ccedefd1a4b05383fb to your computer and use it in GitHub Desktop.
Save mrmorris/a4aee2f00a4834ccedefd1a4b05383fb to your computer and use it in GitHub Desktop.
Download ZIP
Sublime Merge Git Config
Raw
gistfile1.txt
# edit your ~/.gitconfig file...
[diff]
tool = smerge
[merge]
tool = smerge
[difftool]
prompt = false
[mergetool]
prompt = false
keepBackup = false
[mergetool "smerge"]
cmd = smerge \"$REMOTE\" \"$BASE\" \"$LOCAL\" \"$MERGED\"
keepBackup = false
[difftool "smerge"]
cmd = smerge .
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment