mergetools / gvimdiff2on commit verify_lock(): return 0/-1 rather than struct ref_lock * (a5e2499)
   1. "$MERGE_TOOLS_DIR/vimdiff"