diff options
author | Rémy Coutable <remy@rymai.me> | 2016-05-18 19:05:51 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-05-18 19:18:39 +0300 |
commit | 6daec9e6f1a83a2a38b791a24f39e8e4b539c873 (patch) | |
tree | e8478100177a4b30ffc4dbe344f5b4bfa377888c /doc | |
parent | 8a8b5497c5142f225fb4fa3f5441526a0652869a (diff) |
Add documentation for Inline Diff
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/markdown/markdown.md | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md index 4f199b6af6f..b0c6d6a4bbf 100644 --- a/doc/markdown/markdown.md +++ b/doc/markdown/markdown.md @@ -8,6 +8,7 @@ * [Multiple underscores in words](#multiple-underscores-in-words) * [URL auto-linking](#url-auto-linking) * [Code and Syntax Highlighting](#code-and-syntax-highlighting) +* [Inline Diff](#inline-diff) * [Emoji](#emoji) * [Special GitLab references](#special-gitlab-references) * [Task lists](#task-lists) @@ -153,6 +154,19 @@ s = "There is no highlighting for this." But let's throw in a <b>tag</b>. ``` +## Inline Diff + +With inline diffs tags you can display {+ additions +} or [- deletions -]. + +The wrapping tags can be either curly braces or square brackets [+ additions +] or {- deletions -}. + +However the wrapping tags cannot be mixed as such: + +- {+ additions +] +- [+ additions +} +- {- deletions -] +- [- deletions -} + ## Emoji Sometimes you want to :monkey: around a bit and add some :star2: to your :speech_balloon:. Well we have a gift for you: |