Rename conflict
and file
revsets to conflicts
and files
.
#265
Loading
conflict
and file
revsets to conflicts
and files
.
#265