mergetools / gvimdiff2on commit contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>" (57b74cd)
   1. "$MERGE_TOOLS_DIR/vimdiff"