From a1eab5d6a8f6b5085ad8b5ceb63ef0c100c5efcc Mon Sep 17 00:00:00 2001 From: "Y. E" Date: Sun, 22 Nov 2020 01:18:04 +0200 Subject: [PATCH] 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. --- book/07-git-tools/sections/advanced-merging.asc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/07-git-tools/sections/advanced-merging.asc b/book/07-git-tools/sections/advanced-merging.asc index e27cb0779..1fdf6d58a 100644 --- a/book/07-git-tools/sections/advanced-merging.asc +++ b/book/07-git-tools/sections/advanced-merging.asc @@ -580,7 +580,7 @@ The history with the revert commit looks like this: .History after `git revert -m 1` image::images/undomerge-revert.png[History after `git revert -m 1`] -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. +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. Git will get confused if you try to merge `topic` into `master` again: [source,console]