mergetools / gvimdiff2on commit lock_ref_sha1_basic(): if locking fails with ENOENT, retry (e5c223e)
   1. "$MERGE_TOOLS_DIR/vimdiff"