tests/gclient_scm_test.py · da73a4bdaa8999a002b5e092078442807470a37b · Linshizhi / Chromium_Depot_tools

Merge instead of rebasing upstream changes in `gclient sync` when --merge is given. · 30c46d64

bauerb@chromium.org authored Jan 23, 2014

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

30c46d64

gclient_scm_test.py 46.9 KB

Replace gclient_scm_test.py