This update fixes the following issue with kdiff3:
- Fix saving merged files using patch from https://bugs.archlinux.org/task/31813