[RESEND PATCH v3 3/3] doc: document diff/merge.guitool config keys

Signed-off-by: Denton Liu --- Documentation/diff-config.txt | 8 Documentation/merge-config.txt | 6 ++ 2 files changed, 14 insertions(+) diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 85bca83c3..e64d983c3 100644 ---

[PATCH v3 3/3] doc: document diff/merge.guitool config keys

Signed-off-by: Denton Liu --- Documentation/diff-config.txt | 8 Documentation/merge-config.txt | 6 ++ 2 files changed, 14 insertions(+) diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 85bca83c3..e64d983c3 100644 ---