mergetools / vimdiff2on commit config: move flockfile() closer to unlocked functions (05e293c)
   1. "$MERGE_TOOLS_DIR/vimdiff"