diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2013-05-14 18:49:42 +0200 |
|---|---|---|
| committer | Michael Stapelberg <michael@stapelberg.de> | 2013-05-14 18:50:46 +0200 |
| commit | 39b34e75d2776044e6d771c808ddf5043db5a0fd (patch) | |
| tree | 1563b8215307a1c3684da43eb372cc8740fed148 /src/pkg/encoding/json/decode_test.go | |
| parent | 75cafdb248f321775838731e79fbdc0db4ffdd1b (diff) | |
| parent | efcc50dfdc94c82ee0292bf71992ecb7c0123061 (diff) | |
| download | golang-39b34e75d2776044e6d771c808ddf5043db5a0fd.tar.gz | |
Merge branch 'upstream-sid' into debian-sid
Conflicts:
lib/codereview/codereview.py
lib/time/zoneinfo.zip
src/pkg/go/types/testdata/expr1.src
test/fixedbugs/issue5105.dir/a.go
test/fixedbugs/issue5260.dir/a.go
In the end, I extracted go1.1.src.tar.gz and used cp -r /tmp/go/* .
To be honest, I still don’t understand why git-import-orig yields merge
errors at all or how that workflow is supposed to work. If someone could
enlighten me, I’d be happy.
Diffstat (limited to 'src/pkg/encoding/json/decode_test.go')
| -rw-r--r-- | src/pkg/encoding/json/decode_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pkg/encoding/json/decode_test.go b/src/pkg/encoding/json/decode_test.go index 037c5b236..f845f69ab 100644 --- a/src/pkg/encoding/json/decode_test.go +++ b/src/pkg/encoding/json/decode_test.go @@ -30,7 +30,7 @@ type V struct { F3 Number } -// ifaceNumAsFloat64/ifaceNumAsNumber are used to test unmarshalling with and +// ifaceNumAsFloat64/ifaceNumAsNumber are used to test unmarshaling with and // without UseNumber var ifaceNumAsFloat64 = map[string]interface{}{ "k1": float64(1), |