-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
28 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
= This is a bad example | ||
|
||
This is a bad example of AsciiDoc as it doesn't follow the "one line per sentence" rule. If you just write each sentence after each other the diff's and therefore merges are getting worse to handle. Markdown and AsciiDoc will handle single new lines as blanks. In the rendered output no difference can be spotted. | ||
|
||
Run this example with `git diff --no-index one-line-per-sentence.bad-1.adoc one-line-per-sentence.bad-2.adoc`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
= This is a bad example | ||
|
||
This is a bad exmaple of AsciiDoc as it doesn't follow the "one line per sentence" rule. If you just write each sentence after each other the diff's and therefore, merges are getting worse to handle. Markdown and AsciiDoc will handle single new lines as blanks. In the rendered output no difference can be spotted. | ||
|
||
Run this example with `git diff --no-index one-line-per-sentence.bad-1.adoc one-line-per-sentence.bad-2.adoc`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
= This is a good example | ||
|
||
This is a good example of AsciiDoc as it doesn't follow the "one line per sentence" rule. | ||
If you just write each sentence after each other the diff's and therefore merges are getting worse to handle. | ||
Markdown and AsciiDoc will handle single new lines as blanks. | ||
In the rendered output no difference can be spotted. | ||
|
||
Run this example with | ||
`git diff --no-index one-line-per-sentence.good-1.adoc one-line-per-sentence.good-2.adoc`. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
= This is a good example | ||
|
||
This is a good exmaple of AsciiDoc as it doesn't follow the "one line per sentence" rule. | ||
If you just write each sentence after each other the diff's and therefore merges are getting worse to handle. | ||
Markdown and AsciiDoc will handle singlele new lines as blanks. | ||
In the rendered output no difference can be spotted. | ||
|
||
Run this example with | ||
`git diff --no-index one-line-per-sentence.good-1.adoc one-line-per-sentence.good-2.adoc`. |