mergetools / vimdiff2on commit Merge branch 'jk/diff-algo-finishing-touches' into maint (e4d1595)
   1. "$MERGE_TOOLS_DIR/vimdiff"