diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-06-04 12:30:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-04 13:46:53 -0700 |
| commit | dd4287a2c9e9345e0d48c9aa4ee5c330f50623f4 (patch) | |
| tree | f772a1aefc353c1023ba8749502c1e5f75d3bb37 /Documentation/technical/api-merge.txt | |
| parent | Git 1.7.10.4 (diff) | |
| download | tgif-dd4287a2c9e9345e0d48c9aa4ee5c330f50623f4.tar.xz | |
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/technical/api-merge.txt b/Documentation/technical/api-merge.txt index 9dc1bed768..25158b8dc8 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 |