mergetools / vimdiff2on commit lock_ref_sha1_basic: do not die on locking errors (0683951)
   1. "$MERGE_TOOLS_DIR/vimdiff"