Skip to content

Instantly share code, notes, and snippets.

@haya14busa

haya14busa/gist:7278043

Created November 2, 2013 11:42
Show Gist options
  • Save haya14busa/7278043 to your computer and use it in GitHub Desktop.
Save haya14busa/7278043 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
git config --global merge.tool vimdiff
git config --global mergetool.prompt false
git config --global mergetool.keepBackup false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment