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.
Details
Details
- Reviewers
thj des - Commits
- rG898db3e2978b: diff3: fix diff3 -A
rG8d442cf32e4f: diff3: fix diff3 -A
Diff Detail
Diff Detail
- Repository
- rG FreeBSD src repository
- Lint
Lint Skipped - Unit
Tests Skipped - Build Status
Buildable 70661 Build 67544: arc lint + arc unit
Event Timeline
Comment Actions
This looks ok, but I will have to admit that diff3 was always a bit of a mystery box. Please update the comment, but assuming tests don't start failing I'm willing to bet this is an improvement.
| usr.bin/diff3/diff3.c | ||
|---|---|---|
| 884 | This comment is out of date now. | |