Meld

Hi!

I just added the option to merge files with my favorite diff editor meld.

Happy coding!