mergetools / vimdiff2on commit Merge branch 'mk/combine-diff-context-horizon-fix' into maint (a0bf40d)
   1. "$MERGE_TOOLS_DIR/vimdiff"