mergetools / gvimdiff2on commit po/TEAMS: update Thomas Rast's email address (1b12df5)
   1. "$MERGE_TOOLS_DIR/vimdiff"