summaryrefslogtreecommitdiff
path: root/Documentation/technical/api-merge.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/technical/api-merge.txt')
-rw-r--r--Documentation/technical/api-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/api-merge.txt b/Documentation/technical/api-merge.txt
index 9dc1bed..25158b8 100644
--- 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