Support local changes present in .rpmnew.
authorlace <>
Fri, 18 Sep 2009 07:03:52 +0000 (07:03 +0000)
committerlace <>
Fri, 18 Sep 2009 07:03:52 +0000 (07:03 +0000)
commit50a447c4b88ad73e16dec18f354816a248c527fb
treec104aa76c7187d31bea728101d623cef3b94c8d7
parent876fc0b7e706812e845dec68e82bff9c34340932
Support local changes present in .rpmnew.
Do not stop on the first conflict.
bin/rpmmerge