Merge branch 'en/merge-fixes'

diff --git a/t/t5100/msg0015 b/t/t5100/msg0015
index 9577238685acecd1b5d530ffa3f4f03eef25b9b6..4abb3d5c6c4884806cdaabcc0b01acb9c1263af2 100644 (file)
--- a/t/t5100/msg0015
+++ b/t/t5100/msg0015
@@ -1,2 +1,2 @@
-- a list
+  - a list
   - of stuff