Merge branch 'sync-from-rust3' into rustup

Manishearth · Manishearth · commit 741259bece52 · 2021-02-02T19:57:31.000-08:00
diff --git a/.editorconfig b/.editorconfig
@@ -13,6 +13,8 @@ indent_style = space
 indent_size = 4
 
 [*.md]
+# double whitespace at end of line
+# denotes a line break in Markdown
 trim_trailing_whitespace = false
 
 [*.yml]
