diff --git a/bin/internal/engine.merge_method b/bin/internal/engine.merge_method index 97ef86e1d3e..0ca3a58d08c 100644 --- a/bin/internal/engine.merge_method +++ b/bin/internal/engine.merge_method @@ -1 +1 @@ -rebase +squash