mergetools / gvimdiffon commit lock_file(): always initialize and register lock_file object (04e57d4)
   1. "$MERGE_TOOLS_DIR/vimdiff"