mergetools / gvimdiffon commit verify_lock(): report errors via a strbuf (33ffc17)
   1. "$MERGE_TOOLS_DIR/vimdiff"