mergetools / vimdiff2on commit Merge branch 'jn/remote-helpers-with-git-dir' (ace83dc)
   1. "$MERGE_TOOLS_DIR/vimdiff"