mergetools / gvimdiff2on commit git-submodule.sh: avoid "test <cond> -a/-o <cond>" (496eeeb)
   1. "$MERGE_TOOLS_DIR/vimdiff"