mergetools / gvimdiffon commit builtin/apply: add 'lock_file' pointer into 'struct apply_state' (8f31fac)
   1. "$MERGE_TOOLS_DIR/vimdiff"