an Entity in Data Space: 134.155.108.49:8890
This article details a simpler way to use Vimdiff as a Git mergetool.