diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2022-12-14 17:34:59 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2023-03-02 01:20:33 +0000 |
| commit | ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f (patch) | |
| tree | bdac0bee45720297d53a3f7d3d671128ac8c5f2e /UPDATING | |
| parent | c5e54e56e68aa50beb7d2a7b8ae6611490a7ba9e (diff) | |
| download | src-ceb5f28ba5fcfa69de7410d2327.tar.gz src-ceb5f28ba5fcfa69de7410d2327.zip | |
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
Diffstat (limited to 'UPDATING')
0 files changed, 0 insertions, 0 deletions