mergetools / gvimdiff3on commit Sync with maint (c47372d)
   1. "$MERGE_TOOLS_DIR/vimdiff"