Diff, merge in kakoune

Is there anyone succesfully using kakoune as a diff or merge tool?

If so: how?

And: I thought I saw a possibility to select / highlight the changes since the last safe / insert but I can’t find it anymore. Is there a way?

Thank you so much!

Hello, have a look at this old ungoing issue https://github.com/mawww/kakoune/issues/153

thank you!

I saw that. I guess I was just hoping that there was already some sort of hacky solution that didn’t involve using vimdiff.

Looking forward to being able doing averything int kakoune!