mergetools / vimdiff2on commit Merge branch 'nk/config-local-doc' into maint (b6538a0)
   1. "$MERGE_TOOLS_DIR/vimdiff"