Upgrade kdiff3 to 0.9.98
Merge pull request #5231 from joelpurra/kdiff3-0.9.98

Upgrade kdiff3 to 0.9.98