aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/src
diff options
context:
space:
mode:
authorChe-Hsun Liu <chehsunliu@gmail.com>2017-08-14 14:51:49 +0800
committerGitHub <noreply@github.com>2017-08-14 14:51:49 +0800
commit24696c3958f0be6a87b52f07436417c53d0fef24 (patch)
tree4993eb36b3296281b188b5adf662951c910c7fb2 /googlemock/src
parent509f7fe84094dc632ba1794c1f9bd3a7c049d5fe (diff)
parent673c975a963f356b19fea90cb57b69192253da2a (diff)
downloadgoogletest-24696c3958f0be6a87b52f07436417c53d0fef24.tar.gz
googletest-24696c3958f0be6a87b52f07436417c53d0fef24.tar.bz2
googletest-24696c3958f0be6a87b52f07436417c53d0fef24.zip
Merge branch 'master' into master
Diffstat (limited to 'googlemock/src')
-rw-r--r--googlemock/src/gmock-matchers.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/src/gmock-matchers.cc b/googlemock/src/gmock-matchers.cc
index e0de25cb..6e40e5e8 100644
--- a/googlemock/src/gmock-matchers.cc
+++ b/googlemock/src/gmock-matchers.cc
@@ -288,7 +288,7 @@ class MaxBipartiteMatchState {
// Each element of the left_ vector represents a left hand side node
// (i.e. an element) and each element of right_ is a right hand side
// node (i.e. a matcher). The values in the left_ vector indicate
- // outflow from that node to a node on the the right_ side. The values
+ // outflow from that node to a node on the right_ side. The values
// in the right_ indicate inflow, and specify which left_ node is
// feeding that right_ node, if any. For example, left_[3] == 1 means
// there's a flow from element #3 to matcher #1. Such a flow would also