https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=253108
Ed Maste <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Resolution|--- |FIXED Status|New |Closed CC| |[email protected] --- Comment #1 from Ed Maste <[email protected]> --- merge(1) use in freebsd-update was replaced with diff(3) by: commit 073dd71287e2a975bad2deecb58733325f80d133 Author: Baptiste Daroussin <[email protected]> Date: Sun Sep 18 14:48:28 2016 +0000 In preparation for removal of GNU rcs, replace merge(1) usage with direct diff3(1) usage Notes: svn path=/head/; revision=305930 This change is in all supported releases, so this issue should not occur again. -- You are receiving this mail because: You are the assignee for the bug.
