diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-08 08:32:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-08 08:32:20 -0700 |
| commit | 02101c969dba9de4200cdd0cc8d88ce665b2c474 (patch) | |
| tree | 4c975c5f5945564eae86d1e933192c4a9096bfe5 /Documentation/technical/api-merge.txt | |
| parent | a1a031d9356cc89cadc5e14acc4028e3ecc306eb (diff) | |
| parent | fe77b416c774a469a585c4b58fcae5e7a5f3545d (diff) | |
| download | git-02101c969dba9de4200cdd0cc8d88ce665b2c474.tar.gz | |
Merge branch 'mm/api-credentials-doc'
Finishing touches...
* mm/api-credentials-doc:
docs: fix cross-directory linkgit references
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 25158b8dc8..9dc1bed768 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 |