mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-07 00:50:50 +00:00
3d44241546
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:
|
||
---|---|---|
.. | ||
freebsd-update.8 | ||
freebsd-update.conf | ||
freebsd-update.sh | ||
Makefile | ||
Makefile.depend |