]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5e9b79c) | patch
freebsd-update: re-edit files if merge conflict markers remain
authorEd Maste <emaste@FreeBSD.org>
Wed, 14 Dec 2022 17:34:59 +0000 (12:34 -0500)
committerEd Maste <emaste@FreeBSD.org>
Thu, 2 Mar 2023 18:29:57 +0000 (13:29 -0500)
commitc7e3703352037a5afacdc4126725f351fe7da72b
tree69e766e2416f8ba1a5d44b368cca3af82ff2bd5ftree | snapshot
parent5e9b79c4e652be192e76bb4df842ea5228e8c4cacommit | diff
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
Approved by: re (cperciva, expedited MFC)
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D37703

(cherry picked from commit ceb5f28ba5fcfa69de7410d2327d4a5abf2a421f)
usr.sbin/freebsd-update/freebsd-update.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.