Heads-Up: Deprecation of mergemaster

[Cath O'Deray]

… unnecessarily complicated for the user to do that using vi.

I prefer editors/nano:

root@mowa219-gjp4-8570p:~ # grep -e EDITOR -e VISUAL ~/.cshrc
setenv  EDITOR  /usr/local/bin/nano
setenv  VISUAL  /usr/local/bin/nano
# setenv        EDITOR  /usr/bin/vi
# setenv        VISUAL  /usr/bin/vi
root@mowa219-gjp4-8570p:~ #

YMMV; ee(1) is integral to the system.

 

[Alain De Vos]

or featherpad or leafpad.

 

[Cath O'Deray]

… the PR …

We now have use of etcupdate(8) instead of mergemaster(8) under <https://cgit.freebsd.org/src/tree/UPDATING?id=e641c29a006ae9f528f196386052355b42a53d75#n2455>

Related: yesterday's <https://cgit.freebsd.org/src/commit/UPDATING?id=e641c29a006ae9f528f196386052355b42a53d75>