diff options
| author | Claus Stovgaard <claus.stovgaard@gmail.com> | 2017-08-31 12:22:53 +0200 |
|---|---|---|
| committer | Claus Stovgaard <claus.stovgaard@gmail.com> | 2017-08-31 12:22:53 +0200 |
| commit | 34355c0e870efce3015fa19aff88c7d79839bbb1 (patch) | |
| tree | 0fa858569364bb5818793d97d264aefd365399b5 /googletest/scripts/upload.py | |
| parent | a6418a4dd19ea0e8aa5f7706b8bff12a2e453821 (diff) | |
| parent | 16bfba08e2c63c33834a98d092cd6f1a3e547289 (diff) | |
| download | googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.tar.gz googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.tar.bz2 googletest-34355c0e870efce3015fa19aff88c7d79839bbb1.zip | |
Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
# Conflicts:
# .gitignore
Diffstat (limited to 'googletest/scripts/upload.py')
| -rwxr-xr-x | googletest/scripts/upload.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/scripts/upload.py b/googletest/scripts/upload.py index 6e6f9a14..81e8e04d 100755 --- a/googletest/scripts/upload.py +++ b/googletest/scripts/upload.py @@ -732,7 +732,7 @@ class SubversionVCS(VersionControlSystem): else: self.rev_start = self.rev_end = None # Cache output from "svn list -r REVNO dirname". - # Keys: dirname, Values: 2-tuple (ouput for start rev and end rev). + # Keys: dirname, Values: 2-tuple (output for start rev and end rev). self.svnls_cache = {} # SVN base URL is required to fetch files deleted in an older revision. # Result is cached to not guess it over and over again in GetBaseFile(). |