crash when editor exits with non-zero status

[azrdev]

Using m merge mode (in my case, using -f vimdiff and thus using vim as editor) and then quitting the editor with a non-zero exit status (using :cq) crashes rpmconf:

Traceback (most recent call last):
  File "/usr/sbin/rpmconf", line 80, in <module>
    main()
  File "/usr/sbin/rpmconf", line 71, in main
    rconf.run()
  File "/usr/lib/python3.6/site-packages/rpmconf/rpmconf.py", line 96, in run
    tested_files += self._handle_package(pkg_hdr)
  File "/usr/lib/python3.6/site-packages/rpmconf/rpmconf.py", line 310, in _handle_package
    tmp.format(conf_file, "rpmnew"))
  File "/usr/lib/python3.6/site-packages/rpmconf/rpmconf.py", line 368, in _handle_rpmnew
    self._merge_conf_files(conf_file, other_file)
  File "/usr/lib/python3.6/site-packages/rpmconf/rpmconf.py", line 263, in _merge_conf_files
    conf_file, other_file])
  File "/usr/lib64/python3.6/subprocess.py", line 291, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['/usr/bin/vimdiff', '/etc/samba/smb.conf', '/etc/samba/smb.conf.rpmnew']' returned non-zero exit status 1.

fedora 28
rpmconf 1.0.19-3.fc28