conflcts.rs: label conflict markers with conflict #, side #, whether it's a side or a diff #10310
Job | Run time |
---|---|
31s | |
4m 0s | |
28s | |
36s | |
2m 59s | |
14s | |
7m 11s | |
4m 57s | |
2m 26s | |
26s | |
27s | |
24m 15s |
Job | Run time |
---|---|
31s | |
4m 0s | |
28s | |
36s | |
2m 59s | |
14s | |
7m 11s | |
4m 57s | |
2m 26s | |
26s | |
27s | |
24m 15s |