tests/gclient_scm_test.py - Issue 7488015: Add merge attribute to OptionsObject in gclient_scm_test.py.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tests/gclient_scm_test.py

Issue 7488015: Add merge attribute to OptionsObject in gclient_scm_test.py. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 9 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

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

« no previous file with comments | « no previous file | no next file » | no next file with comments »