mergetools / vimdiff2on commit Merge branch 'jk/misc-resolve-ref-unsafe-fixes' (a823e3a)
   1. "$MERGE_TOOLS_DIR/vimdiff"