Add the option to use meld as the diff and merge tool.
Merge pull request #146 from r-sharp/diff_wiff_meld

Add the option to use meld as the diff and merge tool.