commit 4dd093752e4b6bf761f30b317a0131021c997627
author bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jul 22 14:41:51 2011 +0000
committer bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jul 22 14:41:51 2011 +0000
tree f610449b9cff4dca39e6d3f5c464101ebd7e11fd
parent 2aad1b262d01c5075738d53afb1cf203a1b2c475

Add merge attribute to OptionsObject in gclient_scm_test.py.

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

tests/gclient_scm_test.py

diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index 34c1393..5b94a88 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -453,6 +453,7 @@
       self.force = False
       self.reset = False
       self.nohooks = False
+      self.merge = False
 
   sample_git_import = """blob
 mark :1