diff options
| author | Nicolas Frisby <nicolas.frisby@gmail.com> | 2014-08-19 20:03:23 -0500 |
|---|---|---|
| committer | Nicolas Frisby <nicolas.frisby@gmail.com> | 2014-08-19 20:04:15 -0500 |
| commit | f17ceee98221de21f896ac412b7a7ddcfc35a0c6 (patch) | |
| tree | 3b3237251bee546221b9023b9c7cf0a94bc7d37a /libraries/base/tests/T5943.stdout | |
| parent | 4d3f37e0c07f35be51b8bb24374ca3163b8b9a46 (diff) | |
| parent | 15faa0ec3a5a783f3949dcff6adf412d5f21bdf8 (diff) | |
| download | haskell-f17ceee98221de21f896ac412b7a7ddcfc35a0c6.tar.gz | |
Merge branch 'master' into late-lam-lift
Silly conflicts because of new flags -- not sure how best to resolve/avoid this.
git is requiring my commit to mention 'submodule' for some reason?
Conflicts:
compiler/main/DynFlags.hs
Diffstat (limited to 'libraries/base/tests/T5943.stdout')
| -rw-r--r-- | libraries/base/tests/T5943.stdout | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libraries/base/tests/T5943.stdout b/libraries/base/tests/T5943.stdout new file mode 100644 index 0000000000..d24cba1599 --- /dev/null +++ b/libraries/base/tests/T5943.stdout @@ -0,0 +1,7 @@ +upd: Ready +sig: Ready +1 +fin: Updated +upd: Ready +sig: Ready +2 |