B44625Lint
B44625Lint
Lint Messages
Lint Messages
| 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 |