I should add, unlike the original poster, I was not notified of any conflicts when merging, so the presence (or absence) of conflicts when merging does not appear to be the root cause of the problem. A quick grep shows there are no lines containing >>> in the file I uploaded as well, and a visual scan didn't turn up what I would easily recognize as a conflict.
-- 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 ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
