Kdiff3 support

This pull request adds support for kdiff3 as a graphical merge tool.

This will help with supporting Debian based systems, for which no package for xxdiff is available (it must be built from source).