Ed Maste 3d44241546 freebsd-update: allow user to break out of conflict resolution loop ... When a conflict marker is found during update allow the user to confirm they want it to remain in the file. Suggested by: Tim Hogard Reviewed by: imp Sponsored by: The FreeBSD Foundation Fixes: ceb5f28ba5 ("freebsd-update: re-edit files if merge confli...") Differential Revision: https://reviews.freebsd.org/D38896		2023-10-18 12:17:33 -04:00
..
Makefile	…
Makefile.depend	…
freebsd-update.8	…
freebsd-update.conf	…
freebsd-update.sh	…