mergetools / gvimdiff3on commit Fourth batch after 2.20 (b5101f9)
   1. "$MERGE_TOOLS_DIR/vimdiff"