diff3 with the -e (ed script flag) can generate line deletions, add support for
deletions and add a test case to exercise this behaviour. This functionality
was unearthed through comparison of bsd diff3 and gnu diff3 output.
Details
Details
- Reviewers
bapt pstef - Group Reviewers
Klara - Commits
- rG7c03df6855f4: diff3: allow diff3 ed scripts to generate deletions
Diff Detail
Diff Detail
- Repository
- rS FreeBSD src repository - subversion
- Lint
Lint Passed - Unit
No Test Coverage - Build Status
Buildable 45181 Build 42069: arc lint + arc unit
Event Timeline
| usr.bin/diff3/diff3.c | ||
|---|---|---|
| 142 | I would use bool. It's a minor nit, but I think this code is unclear as it is. | |
| 527 | The value of the boolean expression is used only once, so maybe it would be better to evaluate it directly in the function call? | |
| usr.bin/diff3/diff3.c | ||
|---|---|---|
| 527 | I'll convert it to bool, I think having a variable helps make the code a little clearer here. When -A and -m output modes come in they use the value of delete and I think consistency between the three output modes is a good idea. | |