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)
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found