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-fmt-merge-msg.txt | |
| parent | 46fbbcbae6430ff14f0d5ef0e6e9fea90d4fe808 (diff) | |
| download | git-htmldocs-06ce83b0f83d238e1676b4adb708f142ab2f9cab.tar.gz | |
Autogenerated HTML docs for v2.19.1-1052-gd166e
Diffstat (limited to 'git-fmt-merge-msg.txt')
| -rw-r--r-- | git-fmt-merge-msg.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-fmt-merge-msg.txt b/git-fmt-merge-msg.txt index 423b6e033..6793d8fc0 100644 --- a/git-fmt-merge-msg.txt +++ b/git-fmt-merge-msg.txt @@ -51,7 +51,7 @@ OPTIONS CONFIGURATION ------------- -include::fmt-merge-msg-config.txt[] +include::config/fmt-merge-msg.txt[] merge.summary:: Synonym to `merge.log`; this is deprecated and will be removed in |