tests · 4f6d25c4acc05179eba7fd0724efe666fbde355e · Linshizhi / Chromium_Depot_tools

Add merge attribute to OptionsObject in gclient_scm_test.py. · 4dd09375

bauerb@chromium.org authored Jul 22, 2011

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7488015

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

4dd09375

Name	Last commit	Last update
..
subversion_config		Loading commit data...
__init__.py		Loading commit data...
abandon.sh		Loading commit data...
basic.sh		Loading commit data...
checkout_test.py		Loading commit data...
fake_repos.py		Loading commit data...
filesystem_mock.py		Loading commit data...
fix_encoding_test.py		Loading commit data...
gcl_unittest.py		Loading commit data...
gclient_scm_test.py		Loading commit data...
gclient_smoketest.py		Loading commit data...
gclient_utils_test.py		Loading commit data...
hooks.sh		Loading commit data...
local_rietveld.py		Loading commit data...
owners.sh		Loading commit data...
owners_unittest.py		Loading commit data...
patch.sh		Loading commit data...
patch_test.py		Loading commit data...
post-dcommit-hook-test.sh		Loading commit data...
presubmit_unittest.py		Loading commit data...
push-basic.sh		Loading commit data...
push-from-logs.sh		Loading commit data...
rename.sh		Loading commit data...
rietveld_test.py		Loading commit data...
sample_pre_commit_hook		Loading commit data...
save-description-on-failure.sh		Loading commit data...
scm_unittest.py		Loading commit data...
submit-from-new-dir.sh		Loading commit data...
subprocess2_test.py		Loading commit data...
super_mox.py		Loading commit data...
test-lib.sh		Loading commit data...
trial_dir.py		Loading commit data...
trychange_unittest.py		Loading commit data...
upload-local-tracking-branch.sh		Loading commit data...
upload-stale.sh		Loading commit data...
upstream.sh		Loading commit data...
watchlists_unittest.py		Loading commit data...