color-words: take an optional regular expression describing words

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

diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index 2a418175acbe81d8463a32450210b310c35e3cb9..303537357b2fb5d1a0d7fa291d51803ddb97749c 100644 (file)
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
@@ -15,17 +15,17 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

-`git-file-merge` incorporates all changes that lead from the `<base-file>`
+'git-merge-file' incorporates all changes that lead from the `<base-file>`

 to `<other-file>` into `<current-file>`. The result ordinarily goes into
 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
 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.
+`<current-file>` and `<other-file>` are modifications of `<base-file>`,
+then 'git-merge-file' combines both changes.

 
 A conflict occurs if both `<current-file>` and `<other-file>` have 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`
-normally outputs a warning and brackets the conflict with <<<<<<< and
->>>>>>> lines. A typical conflict will look like this:
+in a common segment of lines. If a conflict is found, 'git-merge-file'
+normally outputs a warning and brackets the conflict with lines containing
+<<<<<<< and >>>>>>> markers. A typical conflict will look like this:

 
        <<<<<<< A
        lines in file A
 
        <<<<<<< A
        lines in file A


@@ -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.
 
 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].
 
 
 linkgit:git[1].
 
 


@@ -60,7 +60,7 @@ OPTIONS
        `<current-file>`.
 
 -q::
        `<current-file>`.
 
 -q::

-       Quiet;  do  not  warn about conflicts.
+       Quiet; do not warn about conflicts.

 
 
 EXAMPLES
 
 
 EXAMPLES