commit | 30c46d64d7bb4fe63eec8d7b146e1d3494e38097 | [log] [tgz] |
---|---|---|
author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | Thu Jan 23 12:11:56 2014 +0000 |
committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | Thu Jan 23 12:11:56 2014 +0000 |
tree | 2e7749356b55f45c89347a470ff1906dcfa5a57b | |
parent | 9d2165cd011b26c51a915c6b61d4aae6bdff975e [diff] |
Merge instead of rebasing upstream changes in `gclient sync` when --merge is given. Merge ALL the things! BUG=none Review URL: https://codereview.chromium.org/61823002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@246575 0039d316-1c4b-4281-b951-d872f2087c98