Merge branch 'pb/commit-where'

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 697824cbabdd4bab487b8c943277d3a1d703e59a..28e1861094a1689cdb042df6b1d788620ffdf213 100644 (file)
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -222,7 +222,7 @@ Given a .git/config like this:
 
        ; Our diff algorithm
        [diff]
-               external = "/usr/local/bin/gnu-diff -u"
+               external = /usr/local/bin/diff-wrapper
                renames = true
 
        ; Proxy settings