From: Denton Liu <liu.denton@gmail.com>
Date: Wed, 24 Oct 2018 16:25:43 +0000 (-0400)
Subject: doc: document diff/merge.guitool config keys
X-Git-Tag: v2.20.0-rc0~100^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c217b9384e8ecbde866bfb09e88f1d7f87bc7b29?ds=sidebyside;hp=c217b9384e8ecbde866bfb09e88f1d7f87bc7b29

doc: document diff/merge.guitool config keys

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---