Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
b4f4fae9
Commit
b4f4fae9
authored
Jun 09, 2021
by
Amy Qualls
Committed by
Patrick Bajao
Jun 09, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update feature title to start with a verb
parent
8ada9a71
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
doc/user/project/merge_requests/changes.md
doc/user/project/merge_requests/changes.md
+1
-1
No files found.
doc/user/project/merge_requests/changes.md
View file @
b4f4fae9
...
...
@@ -135,7 +135,7 @@ To disable it:
Feature
.
disable
(
:local_file_reviews
)
```
##
M
erge request conflicts in diff
##
Show m
erge request conflicts in diff
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/232484) in GitLab 13.5.
> - [Deployed behind a feature flag](../../feature_flags.md), disabled by default.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment