diff options
| author |  Štěpán Němec <stepnem@gmail.com> | 2012-07-15 00:20:36 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-08-06 15:34:20 -0700 |
| commit | 7615cb005bf15abce05cbdde775e5fdf4662d655 (patch) | |
| tree | 2fa0f11a15470fc63269e8be3fbcfaa786c66d41 /Documentation/git-merge.txt | |
| parent | Merge branch 'jk/maint-checkout-orphan-check-fix' into maint (diff) | |
| download | tgif-7615cb005bf15abce05cbdde775e5fdf4662d655.tar.xz | |
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 3ceefb8a1f..20f9228511 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: ------------ |