Properties
Properties
- Container
- D34421: diff3: Add support for -A and -m
- Buildable
- Diff 103429
- Origin
- Automatic Buildable
| Severity | Location | Code | Message |
|---|---|---|---|
| Error | usr.bin/diff3/diff3.1:169 | MERGECONFLICT1 | Unresolved merge conflict |
| Error | usr.bin/diff3/tests/long-A.out:5 | MERGECONFLICT1 | Unresolved merge conflict |
| Error | usr.bin/diff3/tests/long-A.out:18 | MERGECONFLICT1 | Unresolved merge conflict |
| Error | usr.bin/diff3/tests/long-merge.out:13 | MERGECONFLICT1 | Unresolved merge conflict |
| Error | usr.bin/diff3/tests/long-merge.out:24 | MERGECONFLICT1 | Unresolved merge conflict |
| Error | usr.bin/diff3/tests/tao-A.out:6 | MERGECONFLICT1 | Unresolved merge conflict |
| Error | usr.bin/diff3/tests/tao-A.out:22 | MERGECONFLICT1 | Unresolved merge conflict |
| Error | usr.bin/diff3/tests/tao-merge.out:2 | MERGECONFLICT1 | Unresolved merge conflict |
| Error | usr.bin/diff3/tests/tao-merge.out:20 | MERGECONFLICT1 | Unresolved merge conflict |
Builds
Builds