CVSROOT: /cvs
Module name: src
Changes by: s...@cvs.openbsd.org 2025/02/26 05:44:51
Modified files:
usr.bin/sdiff : sdiff.1 sdiff.c
Log message:
add options to interactive sdiff(1) merge for choosing both sides of a diff
In some situations there is no clear winner of one side of the diff over
the other, and both sides are needed in the merge result.
Add new merge commands which allow both sides to be chosen in either order,
without a requirement to run the lines through an editor via the existing
'e b' merge command.
ok sthen@
