Request: add git-mergetool for resolving difficult merge conflicts

[jammiben]

Add support for resolving difficult merge conflicts with an external diff/merge tool such as Meld would add power to your tool/software. It could be a prompt that the user can choose when resolving merge conflicts or have a option for enabling/disabling this feature in the settings.

I would really love this feature and I believe other power users would also.