Can't edit a buffer while resolving merge conflict because Invalid Token error.

[YoEight]

Hi,

Indentation-mode can't handle a file with git conflict marks in it.

Regards

[gracjan]

Good use case. Can you provide a unit test case documenting this?

[YoEight]

This time I'll try to not forget doing it!

[gracjan]

If you forget 'illegal token' will haunt you in your dreams.

[gracjan]

@YoEight: How does this go?

[YoEight]

@gracjan Sorry for the delay,

I did find out in the wiki how to come up with a test case and run it. I have zero emacs-lisp knowledge, I browse the tests directory but it didn't help me figuring out a test. Could you give some help ?

[bergey]

@YoEight If you can post a small snippet of Haskell that triggers the bug, I can turn it into a test case. I'll write something like this, using the Haskell string you provide, and telling emacs where the indentation should be.