diff options
Diffstat (limited to 'doc/user/project/merge_requests/changes.md')
| -rw-r--r-- | doc/user/project/merge_requests/changes.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/project/merge_requests/changes.md b/doc/user/project/merge_requests/changes.md index 6703cbf8b03..6e8b0cb1a75 100644 --- a/doc/user/project/merge_requests/changes.md +++ b/doc/user/project/merge_requests/changes.md @@ -149,7 +149,7 @@ The feature is not ready for production use. To avoid displaying the changes that are already on target branch in the diff, we compare the merge request's source branch with HEAD of the target branch. -When there are conflicts between the source and target branch, we show the -conflicts on the merge request diff: +When there are conflicts between the source and target branch, we show an alert +per conflicted file on the merge request diff: - + |