mergetools / vimdiff2on commit apply: move lockfile into `apply_state` (6d058c8)
   1. "$MERGE_TOOLS_DIR/vimdiff"