an Entity in Data Space: 134.155.108.49:8890
Git supports using vim diff to resolve merge conflicts git mergetool -t vimdiff To make it the default merge tool across all your repos git config --global merge.tool vimdiff