Rename conflict and file revsets to conflicts and files.
#4302
| Job | Run time |
|---|---|
| 5m 9s | |
| 7m 36s | |
| 12m 45s |
conflict and file revsets to conflicts and files.
#4302
| Job | Run time |
|---|---|
| 5m 9s | |
| 7m 36s | |
| 12m 45s |