Skip to content

Instantly share code, notes, and snippets.

@cajun-code

cajun-code/tw.gitconfig

Forked from Fykec/tw.gitconfig
Last active August 29, 2015 14:21
Show Gist options
  • Save cajun-code/cef128c818082f5c8bac to your computer and use it in GitHub Desktop.
Save cajun-code/cef128c818082f5c8bac to your computer and use it in GitHub Desktop.
Download ZIP
Raw
tw.gitconfig
[diff]
tool = "twdiff"
[difftool]
prompt = false
[difftool "twdiff"]
cmd = /usr/local/bin/twdiff --wait --resume "$LOCAL" "$REMOTE"
[merge]
tool = "twdiff"
[mergetool]
prompt = false
[mergetool "twdiff"]
cmd = /usr/local/bin/twdiff --wait --resume "$LOCAL" "$REMOTE"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment