doc: document diff/merge.guitool config keys
authorDenton Liu <liu.denton@gmail.com>
Wed, 24 Oct 2018 16:25:43 +0000 (12:25 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Oct 2018 05:02:41 +0000 (14:02 +0900)
commitc217b93...4e8ecbde866bfb09e88f1d7f87bc7b29
tree86209e8...14169d2477d1bfaea6c59b00ef645c65copy hash to clipboard (tree)
parent57ba181...70e07ba66c55c9af466e95ab9f739680copy hash to clipboard (diff)
Documentation/diff-config.txt
Documentation/merge-config.txt