https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=229689
--- Comment #4 from Ed Maste <[email protected]> --- (In reply to Graham Perrin from comment #2) Prefixing the conflict markers with a comment character (#) isn't viable - it could result in even more confusing or unclear behaviour, as the config file would end up with a mix of potentially conflicting settings from the user's config and updated config. When freebsd-update encounters this case it prints --- The following file could not be merged automatically: ${F} Press Enter to edit this file in ${EDITOR} and resolve the conflicts manually... --- and it is up to the user to resolve the conflicts. See https://reviews.freebsd.org/D37703 for a proposal to inform the user if they have unresolved conflicts (and return to editing the file). -- You are receiving this mail because: You are the assignee for the bug.
