mergetools / gvimdiff2on commit t/t5000-tar-tree.sh: avoid "test <cond> -a/-o <cond>" (d0b30a3)
   1. "$MERGE_TOOLS_DIR/vimdiff"