mergetools / gvimdiff2on commit t9104: fix test for following larger parents (b7a06e0)
   1. "$MERGE_TOOLS_DIR/vimdiff"