---

yaml
---
r: 15836
b: refs/heads/try
c: 9f8d2b9
h: refs/heads/master
v: v3

Author: lkuper

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 76f49e497ec43d5ee3d577727a0f9702c4e16b4b
+refs/heads/try: 9f8d2b97d3b37da4a77db3a7d4ad8bfa4ccf136e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/typeck/infer.rs

@@ -1058,7 +1058,7 @@ impl assignment for infer_ctxt {
 // ______________________________________________________________________
 // Type combining
 //
-// There are three type combiners, sub, lub, and gub.  Each implements
+// There are three type combiners, sub, lub, and glb.  Each implements
 // the interface `combine` contains methods for combining two
 // instances of various things and yielding a new instance.  These
 // combiner methods always yield a `result<T>`---failure is propagated