mergetools / vimdiff2on commit lockfile.c: make lock_file return a meaningful errno on failurei (447ff1b)
   1. "$MERGE_TOOLS_DIR/vimdiff"