summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-10-27 06:23:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-10-29 01:17:03 (GMT)
commit7fb5ab4a020185c74007ca04ca6f8de9a3ae3868 (patch)
tree6fb381adefa6734ee8665f12562294e9f998b3a9 /Documentation/git-merge.txt
parentf7ade6c98045d27039a76691657d2fbf08e527fc (diff)
downloadgit-7fb5ab4a020185c74007ca04ca6f8de9a3ae3868.zip
git-7fb5ab4a020185c74007ca04ca6f8de9a3ae3868.tar.gz
git-7fb5ab4a020185c74007ca04ca6f8de9a3ae3868.tar.bz2
config.txt: move merge-config.txt to config/
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index eb36837..4cc8646 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/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