mergetools / vimdiff2on commit Merge branch 'nd/git-dir-pointing-at-gitfile' (01e0fa2)
   1. "$MERGE_TOOLS_DIR/vimdiff"