HomeFreeBSD

diff3: fix diff3 -A

Description

diff3: fix diff3 -A

for cases where file2 differs but file1 and file3 agrees, the code
stored the file2 and file3 line numbers in the de[] editing script
entries but used them as if they were file1 line numbers.

Reviewed by: thj
Differential Revision: https://reviews.freebsd.org/D55276

(cherry picked from commit 8d442cf32e4fb29fbb85090ac29d32d1e30fd824)

Details

Provenance
baptAuthored on Feb 13 2026, 8:33 AM
desCommitted on Mar 22 2026, 2:04 AM
Reviewer
thj
Differential Revision
D55276: diff3: fix diff3 -A
Parents
rGb2fc2556c1ea: nfs_clstate.c: Handle the same stateid case correctly
Branches
Unknown
Tags
Unknown