Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 21 Oct 2024 21:00:08 +0000
From:      bugzilla-noreply@freebsd.org
To:        bugs@FreeBSD.org
Subject:   [Bug 270852] Extra characters in config files after upgrade with freebsd-update(8)
Message-ID:  <bug-270852-227-DdqabIjUeG@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-270852-227@https.bugs.freebsd.org/bugzilla/>
References:  <bug-270852-227@https.bugs.freebsd.org/bugzilla/>

next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D270852

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 mark=
ers
and prompts the user to re-edit.

--=20
You are receiving this mail because:
You are the assignee for the bug.=



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-270852-227-DdqabIjUeG>