mergetools / gvimdiff3on commit t3200-branch: test -M (ff7aa81)
   1. "$MERGE_TOOLS_DIR/vimdiff"