mergetools / vimdiff3on commit t/lib-httpd.sh: avoid "test <cond> -a/-o <cond>" (ce5dadb)
   1. "$MERGE_TOOLS_DIR/vimdiff"