mergetools / gvimdiff2on commit t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4 (0442743)
   1. "$MERGE_TOOLS_DIR/vimdiff"