SIGN IN SIGN UP

Add engine merge method configuration (#23953)

In order for this to take effect, https://skia-review.googlesource.com/c/buildbot/+/167200
needs to be landed and deployed.

The /bin/internal/engine.merge_method file controls how we merge a pull
request created by the engine auto-roller. If it's squash, there's only one
commit for a pull request no matter how many engine commits there are inside
that pull request. If it's rebase, the number of commits in the framework is
equal to the number of engine commits in the pull request. The latter method is
easier to detect regressions but cost more test resources.
L
liyuqian committed
57c2fac14a3dec35e2c15bea07d0d467043aea93
Parent: 50fb729
Committed by GitHub <noreply@github.com> on 11/7/2018, 9:06:38 PM