Dear GRUB folks,
trying to a bisect a regression of AHCI on the ASRock E350M1 with coreboot and GRUB as firmware, `ChangeLog` poses a problem when resetting to an older commit and then cherry-picking certain commits to fix other problems. The problem is that of course conflicts are shown. Do you know how to circumvent that to avoid manually resolving the conflicts? Thanks, Paul
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel
