diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-13 23:06:12 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-13 23:06:12 +0900 |
| commit | 06ce83b0f83d238e1676b4adb708f142ab2f9cab (patch) | |
| tree | fd8a17fa9e44c0cd9998a5dd175c09acad027425 /git-merge.txt | |
| parent | 46fbbcbae6430ff14f0d5ef0e6e9fea90d4fe808 (diff) | |
| download | git-htmldocs-06ce83b0f83d238e1676b4adb708f142ab2f9cab.tar.gz | |
Autogenerated HTML docs for v2.19.1-1052-gd166e
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index eb36837f8..4cc86469f 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -342,7 +342,7 @@ include::merge-strategies.txt[] CONFIGURATION ------------- -include::merge-config.txt[] +include::config/merge.txt[] branch.<name>.mergeOptions:: Sets default options for merging into branch <name>. The syntax and |