config.txt: move merge-config.txt to config/
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Sat, 27 Oct 2018 06:23:19 +0000 (08:23 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Oct 2018 01:17:03 +0000 (10:17 +0900)
commit7fb5ab4...020185c74007ca04ca6f8de9a3ae3868
tree6fb381a...efa6734ee8665f12562294e9f998b3a9copy hash to clipboard (tree)
parentf7ade6c...8045d27039a76691657d2fbf08e527fccopy hash to clipboard (diff)
Documentation/config.txt
Documentation/config/merge.txt [new file with mode: 0644]
Documentation/git-merge.txt
Documentation/merge-config.txt [deleted file]