Index: tests/gclient_scm_test.py |
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py |
index 34c13935ebf32e4ee938bfa03e19ea25911bf559..5b94a88083c031fd2f05883039c6ad99ebf975c5 100755 |
--- a/tests/gclient_scm_test.py |
+++ b/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 |