mergetools / gvimdiff3on commit grep: do not unnecessarily query repo for "--" (dca3b5f)
   1. "$MERGE_TOOLS_DIR/vimdiff"