commit kdiff3