Merge branch 'edge' into meteor-1.8

1 files changed, 43 insertions, 0 deletions

diff --git a/packages/markdown/marked/test/new/gfm_code.md b/packages/markdown/marked/test/new/gfm_code.md
new file mode 100644
index 00000000..79d06b16
--- /dev/null
+++ b/packages/markdown/marked/test/new/gfm_code.md
@@ -0,0 +1,43 @@
+``` js
+var a = 'hello';
+console.log(a + ' world');
+```
+
+~~~bash
+echo "hello, ${WORLD}"
+~~~
+
+```````longfence
+Q: What do you call a tall person who sells stolen goods?
+```````
+
+~~~~~~~~~~  ManyTildes
+A longfence!
+~~~~~~~~~~
+
+How about an empty code block?
+
+```js
+```
+
+How about a code block with only an empty line?
+
+```js
+
+```
+
+With some trailing empty lines:
+
+```
+ciao
+
+
+```
+
+Closing fences must lay on a new line:
+
+```
+hello()
+^```
+"this should still be in the code block!"
+```