mergetools / vimdiff3on commit Merge branch 'jk/update-links-in-docs' into maint (970fb22)
   1. "$MERGE_TOOLS_DIR/vimdiff"