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/merge-config.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/merge-config.txt')
| -rw-r--r-- | Documentation/merge-config.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 86d5b26ab..1ff08ff2c 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -1,10 +1,10 @@ merge.conflictstyle:: Specify the style in which conflicted hunks are written out to working tree files upon merge. The default is "merge", which - shows `<<<<<<<` conflict marker, change made by one side, - `=======` marker, change made by the other side, and then - `>>>>>>>` marker. An alternate style, "diff3", adds `|||||||` - marker and the original text before `=======` marker. + shows a `<<<<<<<` conflict marker, changes made by one side, + a `=======` marker, changes made by the other side, and then + a `>>>>>>>` marker. An alternate style, "diff3", adds a `|||||||` + marker and the original text before the `=======` marker. merge.log:: Whether to include summaries of merged commits in newly created @@ -32,10 +32,10 @@ merge.verbosity:: message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. - Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable. + Can be overridden by the 'GIT_MERGE_VERBOSITY' environment variable. merge.<driver>.name:: - Defines a human readable name for a custom low-level + Defines a human-readable name for a custom low-level merge driver. See linkgit:gitattributes[5] for details. merge.<driver>.driver:: |