Description of problem:
Bad exit of rpmconf when using kdiff3 as the merge editor.

Version-Release number of selected component (if applicable):
rpmconf-1.0.7-1.fc22.noarch

How reproducible:
always

Steps to Reproduce:
1. start rpmconf as rpmconf -a -f kdiff3
2. merge rpm conf files, save, and exit

Actual results:
  File "/usr/lib64/python3.4/subprocess.py", line 620, in check_output
    raise CalledProcessError(retcode, process.args, output=output)
subprocess.CalledProcessError: Command '['/usr/bin/ls', '-ltrd', '/etc/sane.d/dll.conf', '/etc/sane.d/dll.conf.rpmsave']' returned non-zero exit status 2


Expected results:
rpmconf should continue execution until finish with clean exit.