aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/test/gmock-spec-builders_test.cc
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-10-20 17:25:41 -0400
committerGitHub <noreply@github.com>2017-10-20 17:25:41 -0400
commitc208d8df23d6bd4fbe153a34d092aff0fddbc6a5 (patch)
tree820e437ce56c2a4c0d39b783176bf1db1605a283 /googlemock/test/gmock-spec-builders_test.cc
parent3eaba9f07c5f81a8b83432e4ae389ee42337393f (diff)
parent69e48e92de43960a316a826293510b7b3deb9eca (diff)
downloadgoogletest-c208d8df23d6bd4fbe153a34d092aff0fddbc6a5.tar.gz
googletest-c208d8df23d6bd4fbe153a34d092aff0fddbc6a5.tar.bz2
googletest-c208d8df23d6bd4fbe153a34d092aff0fddbc6a5.zip
Merge branch 'master' into master
Diffstat (limited to 'googlemock/test/gmock-spec-builders_test.cc')
-rw-r--r--googlemock/test/gmock-spec-builders_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc
index c649bfd9..a7bf03e5 100644
--- a/googlemock/test/gmock-spec-builders_test.cc
+++ b/googlemock/test/gmock-spec-builders_test.cc
@@ -2682,7 +2682,7 @@ TEST(SynchronizationTest, CanCallMockMethodInAction) {
} // namespace
-// Allows the user to define his own main and then invoke gmock_main
+// Allows the user to define their own main and then invoke gmock_main
// from it. This might be necessary on some platforms which require
// specific setup and teardown.
#if GMOCK_RENAME_MAIN