bruenig/diffpac — pull request #2 by katafractari (2013-03-16 00:49:31+00:00)
Title: Meld

Hi!

I just added the option to merge files with my favorite diff editor meld.

Happy coding!