mergetools / gvimdiff3on commit t/test-lib-functions.sh: avoid "test <cond> -a/-o <cond>" (0cfe6fd)
   1. "$MERGE_TOOLS_DIR/vimdiff"