mergetools / gvimdiffon commit t7000-t7999: fix broken &&-chains (e974e06)
   1. "$MERGE_TOOLS_DIR/vimdiff"