tree 28b2ea9417f2f6b2a516a3380fccba898ffb3d3c
parent 2d5ed986e194cb2e264028fa2aea3ddcdb8b7da3
author liyuqian <liyuqian@google.com> 1541695395 -0800
committer GitHub <noreply@github.com> 1541695395 -0800
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJb5GejCRBK7hj4Ov3rIwAAdHIIAJYhC345zKq4aQonuUXzyEDB
 mPd09RZRxzqW9eMY3fA8arr7K34StuqD9PRVuDkWT/Gy8aMzwwMhxm9i6MoUj0W1
 s+e/M1HBAWkPX47Sd3gROl0O2xPY4TKX0yU2zH6b3qJAnq9lkOlXYqlRBLlcc0/k
 gK1r5Modk17j22WmKH0wWd058vXhRaMsDAaS5ai6WrZsmB7LKwJUPcRr4dCjzBFH
 rZp0FXF5BRTig55aYt2vp/ec5ZbaXUAsRQaHHCQ9891c9L2r22VGSfC7UVGtuSE9
 VS9y9voM6QxbvUiPzDcvC+AjZEUwoZf34DODUWKokGvnqB5ht3hOL+Tu0F8aCEA=
 =J0H/
 -----END PGP SIGNATURE-----
 

Change engine merge method back to squash (#24111)

We need to wait the fix in
https://skia-review.googlesource.com/c/buildbot/+/169724
to land in order to enable the rebase merge method again.

TBR: goderbauer

We'll land this quickly without waiting for presubmit checks
to unblock our engine roller.