Merge branch 'jc/maint-add-u-remove-conflicted'

diff --git a/Documentation/git-sh-setup.txt b/Documentation/git-sh-setup.txt
index 6731f9ac4cc15a757600375307e4a10e32f4424a..18f14b5be89b4e0240f59b13313308f3c09d012c 100644 (file)
--- a/Documentation/git-sh-setup.txt
+++ b/Documentation/git-sh-setup.txt
@@ -16,7 +16,7 @@ This is not a command the end user would want to run.  Ever.
 This documentation is meant for people who are studying the
 Porcelain-ish scripts and/or are writing new ones.
 
-The `git-sh-setup` scriptlet is designed to be sourced (using
+The 'git-sh-setup' scriptlet is designed to be sourced (using
 `.`) by other shell scripts to set up some variables pointing at
 the normal git directories and a few helper shell functions.