tree 2bacfbeb6dac4ebbc2c7a8ac30db6442134a04c1
parent d63d1dde9f08d54d13c625953733fa6aa516604d
author Gavin Mak <gavinmak@google.com> 1604946404 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> 1604946404 +0000

[depot_tools] Add --fork-point when computing merge-base

Using --fork-point when possible reduces the number of merge conflicts when running merge-base.

Bug: 1111269
Change-Id: I7240fdc9a613d2eb4e856b5677fc713551d7afe9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2519729
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>