mergetools / gvimdiff3on commit Sync with v2.16.1 (59c276c)
   1. "$MERGE_TOOLS_DIR/vimdiff"