Skip to content

Commit

Permalink
feat: add diff files
Browse files Browse the repository at this point in the history
  • Loading branch information
aeimer committed Oct 18, 2024
1 parent 0e5c0f1 commit a031ffd
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 0 deletions.
5 changes: 5 additions & 0 deletions var/examples/one-line-per-sentence.bad-1.adoc
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`.
5 changes: 5 additions & 0 deletions var/examples/one-line-per-sentence.bad-2.adoc
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`.
9 changes: 9 additions & 0 deletions var/examples/one-line-per-sentence.good-1.adoc
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`.
9 changes: 9 additions & 0 deletions var/examples/one-line-per-sentence.good-2.adoc
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`.

0 comments on commit a031ffd

Please sign in to comment.