Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- git config --global merge.tool vimdiff
- git config --global merge.conflictstyle diff3
- git config --global mergetool.prompt false
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement