https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264067
Tatsuki Makino <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] --- Comment #8 from Tatsuki Makino <[email protected]> --- The Makefile in src still says mergemaster, but I replaced it with the following: mergemaster -p -> etcupdate -p -F && etcupdate resolve -p mergemaster -> etcupdate -F && etcupdate resolve It seems that etcupdate needs to be run one more time with resolve for some conflicts. -- You are receiving this mail because: You are the assignee for the bug.
