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

@@ -453,6 +453,7 @@ class GitWrapperTestCase(GCBaseTestCase, StdoutCheck, TestCaseUtils,
       self.force = False
       self.reset = False
       self.nohooks = False
+      self.merge = False
 
   sample_git_import = """blob
 mark :1