mergetools / vimdiff3on commit Merge branch 'jk/no-optional-locks' (e6bf6af)
   1. "$MERGE_TOOLS_DIR/vimdiff"