Merge branch 'sb/submodule-doc'

diff --git a/Documentation/technical/api-merge.txt b/Documentation/technical/api-merge.txt
index 25158b8dc8b27c0fe33152fa233f806ec21ab0a7..9dc1bed768a473317dd77c4d1ed93f65b2c4d483 100644 (file)
--- a/Documentation/technical/api-merge.txt
+++ b/Documentation/technical/api-merge.txt
@@ -36,7 +36,7 @@ the operation of a low-level (single file) merge.  Some options:
        ancestors in a recursive merge.
        If a helper program is specified by the
        `[merge "<driver>"] recursive` configuration, it will
-       be used (see linkgit:../gitattributes[5]).
+       be used (see linkgit:gitattributes[5]).
 
 `variant`::
        Resolve local conflicts automatically in favor