https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270852
Ed Maste <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|Open |Closed --- Comment #7 from Ed Maste <[email protected]> --- On all supported releases freebsd-update now checks for merge conflict markers and prompts the user to re-edit. -- You are receiving this mail because: You are on the CC list for the bug.
