The word 'conflict' is pluralized when there is just 1 conflict.
Summary
When there is a single merge conflict, the message shows up as "Showing 1 conflicts between..."
Steps to reproduce
- Create a conflict in a single file.
- When displayed "This merge request contains merge conflicts", click "resolve these conflicts"
What is the current bug behavior?
It currently displays "Showing 1 conflicts between..."
What is the expected correct behavior?
It should display "Showing 1 conflict between..."
Relevant logs and/or screenshots
Edited by Pradyumna Shembekar