diff options
| author | Gennadiy Civil <misterg@google.com> | 2019-08-02 15:32:14 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-08-02 15:32:15 (GMT) |
| commit | c8d338c629e598e2afca391602a0ba719541a8dc (patch) | |
| tree | 3866beff39a973d6531ca95e0d91e4ea9cbd6b98 /googlemock | |
| parent | 8756ef905878f727e8122ba25f483c887cbc3c17 (diff) | |
| parent | 64b17693e3853ffa514a46f9a30f404582c20d37 (diff) | |
| download | googletest-c8d338c629e598e2afca391602a0ba719541a8dc.zip googletest-c8d338c629e598e2afca391602a0ba719541a8dc.tar.gz googletest-c8d338c629e598e2afca391602a0ba719541a8dc.tar.bz2 | |
Merge pull request #2353 from anttsov:patch-1
PiperOrigin-RevId: 261198930
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/README.md | 7 | ||||
| -rwxr-xr-x | googlemock/scripts/upload.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/googlemock/README.md b/googlemock/README.md index 55c4b83..183fdb8 100644 --- a/googlemock/README.md +++ b/googlemock/README.md @@ -28,6 +28,13 @@ gMock: - does not use exceptions, and - is easy to learn and use. +Details and examples can be found here: + +* [gMock for Dummies](docs/for_dummies.md) +* [Legacy gMock FAQ](docs/gmock_faq.md) +* [gMock Cookbook](docs/cook_book.md) +* [gMock Cheat Sheet](docs/cheat_sheet.md) + Please note that code under scripts/generator/ is from the [cppclean project](http://code.google.com/p/cppclean/) and under the Apache License, which is different from Google Mock's license. diff --git a/googlemock/scripts/upload.py b/googlemock/scripts/upload.py index 4b57473..95239dc 100755 --- a/googlemock/scripts/upload.py +++ b/googlemock/scripts/upload.py @@ -631,7 +631,7 @@ class VersionControlSystem(object): new_content: For text files, this is empty. For binary files, this is the contents of the new file, since the diff output won't contain information to reconstruct the current file. - is_binary: True if the file is binary. + is_binary: True iff the file is binary. status: The status of the file. """ |