Merge branch 'jc/maint-template-permbits'

[git.git] / Documentation / git-merge-file.txt

diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index 6e70ea4923cef0bcb9c0c88c04987e29658f8270..024ec015a3a3e0d3677a82e082e72a36c4572827 100644 (file)
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
@@ -39,8 +39,8 @@ the alternatives.
 The exit value of this program is negative on error, and the number of
 conflicts otherwise. If the merge was clean, the exit value is 0.
 
-'git-merge-file' is designed to be a minimal clone of RCS `merge`; that is, it
-implements all of RCS merge's functionality which is needed by
+'git-merge-file' is designed to be a minimal clone of RCS 'merge'; that is, it
+implements all of RCS 'merge''s functionality which is needed by
 linkgit:git[1].