Vim freezes when resolving merge conflict on a markdown file with fugitive

[fikovnik]

With the following option:

let g:wiki_filetypes = ['md']

vim freezes (blank screen - does not respond to anything except SIGKILL) when I have a merge conflict in an .md file which I try to resolve using fugitive Gvdiffsplit command (all the fugitive diff commands do the same). If this option is not set, all works fine.

Is there a way to disable wiki in the fugitive diff session?

Steps to reproduce:

1. have both wiki.vim and fugitive installed
2. create a merge conflict - say in a file README.md
3. set g:wiki_filetypes to ['md']
4. invoke :Gvdiffsplit README.md

[lervag]

Thanks! I've noticed the same error, but never realized it was wiki.vim. Should be fixed now!

[fikovnik]

Amazing! Thanks a lot for such a quick fix!

[lervag]

No problem, and thanks for providing the good issue description!