mergetools / vimdiff2on commit Merge branch 'rs/notes-merge-no-toctou' (d0b6966)
   1. "$MERGE_TOOLS_DIR/vimdiff"