Send the following on WhatsApp
Continue to ChatUse vimdiff as git mergetool https://mamchenkov.net/wordpress/2017/02/09/use-vimdiff-as-git-mergetool/
Use vimdiff as git mergetool https://mamchenkov.net/wordpress/2017/02/09/use-vimdiff-as-git-mergetool/