Commit e0aabd52 authored by Marcia Ramos's avatar Marcia Ramos

Merge branch '62813-show-inline-diff-example-rendered' into 'master'

Show inline diff example rendered

Closes #62813

See merge request gitlab-org/gitlab-ce!29239
parents 8863e0c7 bb3280f1
...@@ -246,7 +246,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#inline- ...@@ -246,7 +246,7 @@ https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/user/markdown.md#inline-
With inline diffs tags you can display {+ additions +} or [- deletions -]. With inline diffs tags you can display {+ additions +} or [- deletions -].
The wrapping tags can be either curly braces or square brackets: [+ additions +] or {- deletions -}. The wrapping tags can be either curly braces or square brackets.
Examples: Examples:
...@@ -257,6 +257,10 @@ Examples: ...@@ -257,6 +257,10 @@ Examples:
- [- deletions -] - [- deletions -]
``` ```
becomes:
![inline diffs tags rendered](img/markdown_inline_diffs_tags_rendered.png)
However the wrapping tags cannot be mixed as such: However the wrapping tags cannot be mixed as such:
``` ```
......
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