[Bug 270852] Extra characters in config files after upgrade with freebsd-update(8)

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: <bugzilla-noreply_at_freebsd.org>
Date: Mon, 21 Oct 2024 21:00:08 UTC

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270852

Ed Maste <emaste@freebsd.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
         Resolution|---                         |FIXED
             Status|Open                        |Closed

--- Comment #7 from Ed Maste <emaste@freebsd.org> ---
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.