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
..
freebsd-update.8	freebsd-update: add a note about when files may be deleted	2023-10-04 10:45:57 -04:00
freebsd-update.conf	Remove $FreeBSD$: one-line sh pattern	2023-08-16 11:55:03 -06:00
freebsd-update.sh	freebsd-update: allow user to break out of conflict resolution loop	2023-10-18 12:17:33 -04:00
Makefile	Remove $FreeBSD$: one-line sh pattern	2023-08-16 11:55:03 -06:00
Makefile.depend	Remove $FreeBSD$: one-line sh pattern	2023-08-16 11:55:03 -06:00