summaryrefslogtreecommitdiff
path: root/Documentation/technical/api-merge.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-04 19:30:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-06-04 20:46:53 (GMT)
commitdd4287a2c9e9345e0d48c9aa4ee5c330f50623f4 (patch)
treef772a1aefc353c1023ba8749502c1e5f75d3bb37 /Documentation/technical/api-merge.txt
parent121f71f0da1bc9a4e1e96be2c3e683191a82a354 (diff)
downloadgit-dd4287a2c9e9345e0d48c9aa4ee5c330f50623f4.zip
git-dd4287a2c9e9345e0d48c9aa4ee5c330f50623f4.tar.gz
git-dd4287a2c9e9345e0d48c9aa4ee5c330f50623f4.tar.bz2
doc: fix xref link from api docs to manual pages
They are one-level above, so refer them as linkgit:../git-foo[n] with "../" Signed-off-by: Junio C Hamano <gitster@pobox.com>
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