On Sat, Oct 31, 2009 at 01:26:22PM +0000, Colin Watson wrote: > > This usually means that there is a problem with the way the branches > were created or with the way they've been managed, such that the files > in each branch do not have common ancestry.
I had to regenerate the commits one by one (fortunately there weren't many). Do you know a more efficient way? -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all." _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel