mergetools / gvimdiff2on commit lockfile: add accessors get_lock_file_fd() and get_lock_file_fp() (c99a4c2)
   1. "$MERGE_TOOLS_DIR/vimdiff"