mergetools / vimdiff2on commit Merge branch 'jk/config-lockfile-leak-fix' (b0727e2)
   1. "$MERGE_TOOLS_DIR/vimdiff"