mergetools / vimdiff2on commit git-svn: warn instead of dying when commit data is missing (2af7da9)
   1. "$MERGE_TOOLS_DIR/vimdiff"