Sync with 1.7.11.5

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 3ceefb8a1f3b17f4301d89f8eec1cc4bb103a24a..20f9228511e82ac9ced81889bcc66f41504710a3 100644 (file)
--- 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:
 
 ------------