Date: Wed, 14 Dec 2022 17:20:56 +0000 From: bugzilla-noreply@freebsd.org To: bugs@FreeBSD.org Subject: [Bug 253108] freebsd-update calling non-existing "merge" command Message-ID: <bug-253108-227-ZCVUfNcGDf@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-253108-227@https.bugs.freebsd.org/bugzilla/> References: <bug-253108-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=3D253108 Ed Maste <emaste@freebsd.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|New |Closed CC| |emaste@freebsd.org --- Comment #1 from Ed Maste <emaste@freebsd.org> --- merge(1) use in freebsd-update was replaced with diff(3) by: commit 073dd71287e2a975bad2deecb58733325f80d133 Author: Baptiste Daroussin <bapt@FreeBSD.org> Date: Sun Sep 18 14:48:28 2016 +0000 In preparation for removal of GNU rcs, replace merge(1) usage with dire= ct diff3(1) usage Notes: svn path=3D/head/; revision=3D305930 This change is in all supported releases, so this issue should not occur ag= ain. --=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-253108-227-ZCVUfNcGDf>