diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-23 21:35:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-23 21:35:38 -0700 |
| commit | 44dcd493a7896aabe2b48b0a2935633538d81f7c (patch) | |
| tree | 55fb9bfad3faa4309b5e1c0781f78d635c6dbd3b /git-merge.txt | |
| parent | bb300643ea913f58d836780e949b1ebcce8da530 (diff) | |
| download | git-htmldocs-44dcd493a7896aabe2b48b0a2935633538d81f7c.tar.gz | |
Autogenerated HTML docs for v1.7.12-rc0
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index 3ceefb8a1..20f922851 100644 --- a/git-merge.txt +++ b/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: ------------ |