diff options
| author | Thomas Ackermann <th.acker@arcor.de> | 2013-01-21 20:17:53 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-01 13:53:33 -0800 |
| commit | 2de9b71138171dca7279db3b3fe67e868c76d921 (patch) | |
| tree | 09cc74f510322f4f1241cd11a374490bc32d5aa3 /Documentation/git-merge.txt | |
| parent | 48a8c26c625a4d3631c4f614bceb38933e741408 (diff) | |
| download | git-2de9b71138171dca7279db3b3fe67e868c76d921.tar.gz | |
Documentation: the name of the system is 'Git', not 'git'
Signed-off-by: Thomas Ackermann <th.acker@arcor.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index d34ea3c50b..c852a2677a 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -178,10 +178,10 @@ of the merge. Among the changes made to the common ancestor's version, non-overlapping ones (that is, you changed an area of the file while the other side left that area intact, or vice versa) are incorporated in the 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 +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 the one used by the "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: ------------ |