Ubuntu
ucf package

Branches for Karmic

Name		Status	Last Modified	Last Commit
lp:ubuntu/karmic/ucf		1 Development	2009-09-03 16:21:15 UTC 2009-09-03	6. On a three-way merge conflict, output... Author: Steve Langasek Revision Date: 2009-08-25 16:10:29 UTC On a three-way merge conflict, output the error message using a debconf error and then return to the debconf menuinstead of throwing a non-zero error code and causing the package install to abort. Anything the user needs to do to fix up the broken merge can be done as well from the debconf menu as from after the install failure, and this way we don't have a logjam of failed package installs on dist-upgrade. LP: #269539, #293687.