Skip to content

Commit a1eab5d

Browse files
committed
Fix formatting issue
Asciidoctor documentation suggests solution to properly render a possessive monospaced phrase by using unconstrained formatting. However, this approach does not work when one more monospaced phrase follows in the same paragraph. The simplest workaround was suggested by the Asciidoctor project lead: Dan Allen.
1 parent 14ab61c commit a1eab5d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

book/07-git-tools/sections/advanced-merging.asc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ The history with the revert commit looks like this:
580580
.History after `git revert -m 1`
581581
image::images/undomerge-revert.png[History after `git revert -m 1`]
582582

583-
The new commit `^M` has exactly the same contents as `C6`, so starting from here it's as if the merge never happened, except that the now-unmerged commits are still in `HEAD`'s history.
583+
The new commit `^M` has exactly the same contents as `C6`, so starting from here it's as if the merge never happened, except that the now-unmerged commits are still in `HEAD`s history.
584584
Git will get confused if you try to merge `topic` into `master` again:
585585

586586
[source,console]

0 commit comments

Comments
 (0)