Commit 01eca76a authored by Amy Qualls's avatar Amy Qualls

Add temporary image as example

Even though the UI will change, let's show how the feature looks
right now.
parent b4f4fae9
......@@ -151,7 +151,9 @@ 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 as well.
conflicts on the merge request diff as well:
![Example of a conflict shown in a merge request diff](img/conflict_ui_v14_0.png)
### Enable or disable merge request conflicts in diff **(FREE SELF)**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment