diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2008-12-09 07:23:51 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-09 20:57:52 -0800 |
| commit | 29b802aae6213d02879d21aabac1a8d2e035b583 (patch) | |
| tree | 341c1efeb55daaca255cd58a11386ebdeb9b3d7f /Documentation/git-merge-file.txt | |
| parent | 9c0c1b1f28e27bf4ac8a7b13f0b0ed3eaebc8cff (diff) | |
| download | git-29b802aae6213d02879d21aabac1a8d2e035b583.tar.gz git-29b802aae6213d02879d21aabac1a8d2e035b583.tar.xz | |
Improve language in git-merge.txt and related docs
Improve some minor language and format issues like hyphenation,
phrases, spacing, word order, comma, attributes.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
| -rw-r--r-- | Documentation/git-merge-file.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt index 024ec015a..303537357 100644 --- a/Documentation/git-merge-file.txt +++ b/Documentation/git-merge-file.txt @@ -15,17 +15,17 @@ SYNOPSIS 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 `<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. +`<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 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: +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 @@ -60,7 +60,7 @@ OPTIONS `<current-file>`. -q:: - Quiet; do not warn about conflicts. + Quiet; do not warn about conflicts. EXAMPLES |