Ed Maste ceb5f28ba5 freebsd-update: re-edit files if merge conflict markers remain ... freebsd-update will open ${EDITOR} if conflicts occur while merging updates to config files. Inform the user if they've left conflict markers behind, and go back to editing the file. PR: 185546 PR: 229689 Reviewed by: delphij Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37703		2023-03-01 20:20:33 -05:00
..
freebsd-update.8	uname.1: Clarify the -r option	2022-09-16 13:27:54 +02:00
freebsd-update.conf	freebsd-update: create a ZFS boot environment on install	2021-07-15 23:07:00 -05:00
freebsd-update.sh	freebsd-update: re-edit files if merge conflict markers remain	2023-03-01 20:20:33 -05:00
Makefile	Move freebsd-update.conf to usr.sbin/freebsd-update.	2018-08-04 22:25:41 +00:00
Makefile.depend