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
Identifier (URI) | Rank |
---|---|
dbkwik:resource/aF9rxv3NZ1aDk0XFL8RIjA== | 5.88129e-14 |