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