aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/test
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2018-08-09 10:40:06 -0700
committerGitHub <noreply@github.com>2018-08-09 10:40:06 -0700
commit4e13415ff445923573ecde242eecf917551469cc (patch)
tree16a427916a252f3d02e701a7198af84bd8ac2f71 /googlemock/test
parentdb43df6df733c3b6c8a0a049e2000bb9869c5a8a (diff)
parent4843eafd9e86814d44eea2dd5cd93def02eb5bbf (diff)
downloadgoogletest-4e13415ff445923573ecde242eecf917551469cc.tar.gz
googletest-4e13415ff445923573ecde242eecf917551469cc.tar.bz2
googletest-4e13415ff445923573ecde242eecf917551469cc.zip
Merge branch 'master' into master
Diffstat (limited to 'googlemock/test')
-rwxr-xr-xgooglemock/test/gmock_output_test.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py
index 8f57d46c..c8af0f96 100755
--- a/googlemock/test/gmock_output_test.py
+++ b/googlemock/test/gmock_output_test.py
@@ -33,9 +33,10 @@
To update the golden file:
gmock_output_test.py --build_dir=BUILD/DIR --gengolden
-# where BUILD/DIR contains the built gmock_output_test_ file.
+where BUILD/DIR contains the built gmock_output_test_ file.
gmock_output_test.py --gengolden
gmock_output_test.py
+
"""
__author__ = 'wan@google.com (Zhanyong Wan)'