Merge pull request #1164 from katrinleinweber/patch-1

Format quoted option string as <code> in HTML

Author: ben

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.