tree 698d72a2742ecac10f0e53ab9c46f70a0c295a5c
parent 56a624ac5686f8b7ec0d69f3143bb83179c2bacc
author iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 1395869267 +0000
committer iannucci@chromium.org <iannucci@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> 1395869267 +0000

Make mark-merge-base cap the marked merge base at the real merge-base.

R=agable@chromium.org
BUG=

Review URL: https://codereview.chromium.org/212213004

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@259697 0039d316-1c4b-4281-b951-d872f2087c98