mergetools / gvimdiff2on commit Merge branch 'jk/xdiff-clamp-funcname-context-index' into maint (ae76814)
   1. "$MERGE_TOOLS_DIR/vimdiff"