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
7c20829c
Commit
7c20829c
authored
Dec 14, 2017
by
Dimitrie Hoekstra
Committed by
Achilleas Pipinellis
Dec 14, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
clearer-documentation-on-inline-diffs
parent
8b33670e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
3 deletions
+25
-3
doc/user/markdown.md
doc/user/markdown.md
+11
-0
spec/fixtures/markdown.md.erb
spec/fixtures/markdown.md.erb
+14
-3
No files found.
doc/user/markdown.md
View file @
7c20829c
...
@@ -195,12 +195,23 @@ With inline diffs tags you can display {+ additions +} or [- deletions -].
...
@@ -195,12 +195,23 @@ 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 [+ additions +] or {- deletions -}.
Examples:
```
-
{+ additions +}
-
[+ additions +]
-
{- deletions -}
-
[- deletions -]
```
However the wrapping tags cannot be mixed as such:
However the wrapping tags cannot be mixed as such:
```
-
{+ additions +]
-
{+ additions +]
-
[+ additions +}
-
[+ additions +}
-
{- deletions -]
-
{- deletions -]
-
[
- deletions -}
-
[
- deletions -}
```
### Emoji
### Emoji
...
...
spec/fixtures/markdown.md.erb
View file @
7c20829c
...
@@ -258,12 +258,23 @@ With inline diffs tags you can display {+ additions +} or [- deletions -].
...
@@ -258,12 +258,23 @@ 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 [+ additions +] or {- deletions -}.
However the wrapping tags can not be mixed as such -
Examples:
```
- {+ additions +}
- [+ additions +]
- {- deletions -}
- [- deletions -]
```
However the wrapping tags cannot be mixed as such:
```
- {+ additions +]
- {+ additions +]
- [+ additions +}
- [+ additions +}
- {- delletions -]
- {- deletions -]
- [- delletions -}
- [- deletions -}
```
### Videos
### Videos
...
...
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