mergetools / vimdiff3on commit Merge branch 'nd/doc-git-index-version' into maint (2217579)
   1. "$MERGE_TOOLS_DIR/vimdiff"