summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorŠtěpán Němec <stepnem@gmail.com>2012-07-14 22:20:36 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-06 22:34:20 (GMT)
commit7615cb005bf15abce05cbdde775e5fdf4662d655 (patch)
tree2fa0f11a15470fc63269e8be3fbcfaa786c66d41 /Documentation/git-merge.txt
parent1b8e822e572f3c86e0c0d1e9e8bc29d016a4e3d3 (diff)
downloadgit-7615cb005bf15abce05cbdde775e5fdf4662d655.zip
git-7615cb005bf15abce05cbdde775e5fdf4662d655.tar.gz
git-7615cb005bf15abce05cbdde775e5fdf4662d655.tar.bz2
doc: A few minor copy edits.
- (glossary) the quotes around the Wikipedia URL prevented its linkification in frontends that support it; remove them - (manual) newer version (SHA-1) == following, older == preceding, not the other way around - trivial typo and wording fixes Signed-off-by: Štěpán Němec <stepnem@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 3ceefb8..20f9228 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -181,7 +181,7 @@ final result verbatim. When both sides made changes to the same area,
however, git cannot randomly pick one side over the other, and asks you to
resolve it by leaving what both sides did to that area.
-By default, git uses the same style as that is used by "merge" program
+By default, git uses the same style as the one used by the "merge" program
from the RCS suite to present such a conflicted hunk, like this:
------------