From 0a74395c25ce9cfcb6a1ea72a45f3f1add093846 Mon Sep 17 00:00:00 2001 From: Katrin Leinweber <9948149+katrinleinweber@users.noreply.github.com> Date: Sat, 19 Jan 2019 17:11:24 +0100 Subject: [PATCH] Format as in HTML --- 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 bc35f988a..d8b7e9d95 100644 --- a/book/07-git-tools/sections/advanced-merging.asc +++ b/book/07-git-tools/sections/advanced-merging.asc @@ -357,7 +357,7 @@ Let's explore a couple of tools that you now have at your disposal to determine Perhaps it's not obvious how exactly you should fix this conflict. You need more context. -One helpful tool is `git checkout` with the `--conflict' option. +One helpful tool is `git checkout` with the `--conflict` option. This will re-checkout the file again and replace the merge conflict markers. This can be useful if you want to reset the markers and try to resolve them again.