Merge branch 'da/mergetool-trust-exit-code' into maint

diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index 577ee844e0ed09e9f0339de55cf14a29ca7bdab2..a5f99cbb11ba3f7957b9fcd432354c08d99a32c1 100644 (file)
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -177,7 +177,7 @@ sharedindex.<SHA-1>::
 info::
        Additional information about the repository is recorded
        in this directory. This directory is ignored if $GIT_COMMON_DIR
-       is set and "$GIT_COMMON_DIR/index" will be used instead.
+       is set and "$GIT_COMMON_DIR/info" will be used instead.
 
 info/refs::
        This file helps dumb transports discover what refs are