https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270852
Ed Maste <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #6 from Ed Maste <[email protected]> --- Note that freebsd-update will (currently) refuse to proceed and prompt the user to re-edit the file, if conflict markers like <<<<<<<<, =========, or >>>>>>>> are found in the file. -- You are receiving this mail because: You are on the CC list for the bug.
