Install two-ways git merge plugin for vim

Use with `git mergetool`

Install/Templates/vimrc

@@ -12,6 +12,7 @@ Plugin 'dag/vim-fish' " Full fish modular support
 Plugin 'tpope/vim-endwise' " Automatically close things like adding `end` in fish scripts
 Plugin 'alvan/vim-closetag' " Automatically close html tags
 Plugin 'quabug/vim-gdscript' " Old plugin for GoDot 3 syntax highlighting
+Plugin 'whiteinge/diffconflicts' " Two-ways git merge tool
 call vundle#end()
 
 " Make hard tab look like 4 spaces tabs

Install/dev-custom

@@ -14,6 +14,12 @@ git config --global push.followTags true
 git config --global diff.tool vimdiff
 git config --global core.excludesfile '~/.gitignore'
 
+# Git two-ways merge tool (look for whiteinge/diffconflicts in vimrc)
+git config --global merge.tool diffconflicts
+git config --global mergetool.diffconflicts.cmd 'vim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'
+git config --global mergetool.diffconflicts.trustExitCode true
+git config --global mergetool.keepBackup false
+
 # Copy global gitignore
 cp --update --link ./Templates/gitignore ~/.gitignore