I suggest to review changes ("df" instead of "tf" in etcupdate) to at least those files which you know you have modified, including the password/group stuff. After that you can decide if the diff which is shown with "df" can be applied ("tf"), or if you want to keep the old version ("mf"), or if you want to modify the current file ("e", with both versions present in the file so that you can copy/paste between the different versions and keep what you need).The key sequences required to copy and paste between files in the edit screenwere elusive. Probably it was thought self-evident, but not for me. I last tried it long ago, via mergemaster. Is there is a guide to commands for merging filesusing /etcupdate? Is it in the vi man page? I couldn't find it.
etcupdate respects the EDITOR env-variable. You can use any editor you like there.
Typically I use the mouse to copy&paste myself and google every time I can't (https://linuxize.com/post/how-to-copy-cut-paste-in-vim/).
Bye, Alexander. -- http://www.Leidinger.net alexan...@leidinger.net: PGP 0x8F31830F9F2772BF http://www.FreeBSD.org netch...@freebsd.org : PGP 0x8F31830F9F2772BF
pgp4RaBvVQJjb.pgp
Description: Digitale PGP-Signatur
