mergetools / vimdiff3on commit Merge branch 'jk/fast-import-cleanup' (53a0f9f)
   1. "$MERGE_TOOLS_DIR/vimdiff"