mergetools / vimdiff2on commit struct ref_update: add a lock field (81c960e)
   1. "$MERGE_TOOLS_DIR/vimdiff"