Comment 35 for bug 269539

The ucf package that's just been uploaded will help to trap these merge errors where the user can deal with them immediately, instead of cascading them into a dist-upgrade failure. I think that's as much as can be hoped for here; grub itself can't do anything more to prevent the three-way-merge failures, which are always a possibility.

Ultimately, though, as Colin points out, switching to grub2 is the right thing to do, and will completely bypass the need for ucf at all.