mergetools / gvimdiff2on commit git-rebase--interactive.sh: avoid "test <cond> -a/-o <cond>" (e425f6a)
   1. "$MERGE_TOOLS_DIR/vimdiff"