ceb5f28ba5
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 |
||
---|---|---|
.. | ||
freebsd-update.8 | ||
freebsd-update.conf | ||
freebsd-update.sh | ||
Makefile | ||
Makefile.depend |