mergetools / vimdiff2on commit config: don't implicitly use gitdir or commondir (dc8441f)
   1. "$MERGE_TOOLS_DIR/vimdiff"