Revert "Change engine merge method back to squash" (#24114)

Reverts flutter/flutter#24111 as https://skia-review.googlesource.com/c/buildbot/+/167200 has been deployed.

Revert "Change engine merge method back to squash" (#24114)
Reverts flutter/flutter#24111 as https://skia-review.googlesource.com/c/buildbot/+/167200 has been deployed.
b21fe0aa · liyuqian · GitHub · 515dbcba · b21fe0aa
Unverified Commit b21fe0aa authored Nov 08, 2018 by liyuqian Committed by GitHub Nov 08, 2018
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

engine.merge_method bin/internal/engine.merge_method +1 -1

No files found.
--- a/bin/internal/engine.merge_method
+++ b/bin/internal/engine.merge_method
-squash
+rebase