Skip to content

Commit 1551a5c

Browse files
authored
Merge pull request #1852 from petk/patch-apostrophe
Sync apostrophe character
2 parents 6dd434e + 157f2c6 commit 1551a5c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,8 @@ 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.
584-
Git will get confused if you try to merge `topic` into `master` again:
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.
584+
Git will get confused if you try to merge ``topic`` into ``master`` again:
585585

586586
[source,console]
587587
----

0 commit comments

Comments
 (0)