The file you uploaded was not /var/run/grub/menu.lst, it was /boot/grub/menu.lst.
You're probably better off foregoing a three-way merge in your case; the fix for this bug was for ucf to avoid aborting on this case, instead giving the user a chance to pick a different option from the menu. -- Three-way merge issues with menu.lst file during kernel updates: "Conflicts found! Please edit `/var/run/grub/menu.lst' and sort them out manually." https://bugs.launchpad.net/bugs/269539 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
