X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgit-merge-file.txt;fp=Documentation%2Fgit-merge-file.txt;h=6e70ea4923cef0bcb9c0c88c04987e29658f8270;hb=ba020ef5eb5fca3d757bd580ff117adaf81ca079;hp=2a418175acbe81d8463a32450210b310c35e3cb9;hpb=0979c106498f21838140313b485f90faf06f454f;p=git.git

diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index 2a418175a..6e70ea492 100644
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
@@ -15,15 +15,15 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-`git-file-merge` incorporates all changes that lead from the `<base-file>`
+'git-file-merge' incorporates all changes that lead from the `<base-file>`
 to `<other-file>` into `<current-file>`. The result ordinarily goes into
-`<current-file>`. `git-merge-file` is useful for combining separate changes
+`<current-file>`. 'git-merge-file' is useful for combining separate changes
 to an original. Suppose `<base-file>` is the original, and both
 `<current-file>` and `<other-file>` are modifications of `<base-file>`.
-Then `git-merge-file` combines both changes.
+Then 'git-merge-file' combines both changes.
 
 A conflict occurs if both `<current-file>` and `<other-file>` have changes
-in a common segment of lines. If a conflict is found, `git-merge-file`
+in a common segment of lines. If a conflict is found, 'git-merge-file'
 normally outputs a warning and brackets the conflict with <<<<<<< and
 >>>>>>> lines. A typical conflict will look like this:
 
@@ -39,7 +39,7 @@ 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
+'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].