From fa922d74c525a8f66584e50b60b8dfc3cd237a90 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Sat, 27 Oct 2018 08:22:51 +0200 Subject: [PATCH] config.txt: move diff-config.txt to config/ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano --- Documentation/config.txt | 2 +- Documentation/{diff-config.txt => config/diff.txt} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename Documentation/{diff-config.txt => config/diff.txt} (99%) diff --git a/Documentation/config.txt b/Documentation/config.txt index 83f5ce9056..5693ce7654 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -319,7 +319,7 @@ include::config/credential.txt[] include::config/completion.txt[] -include::diff-config.txt[] +include::config/diff.txt[] difftool..path:: Override the path for the given tool. This is useful in case diff --git a/Documentation/diff-config.txt b/Documentation/config/diff.txt similarity index 99% rename from Documentation/diff-config.txt rename to Documentation/config/diff.txt index 85bca83c30..e4db77bc82 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/config/diff.txt @@ -177,7 +177,7 @@ diff.tool:: Any other value is treated as a custom diff tool and requires that a corresponding difftool..cmd variable is defined. -include::mergetools-diff.txt[] +include::../mergetools-diff.txt[] diff.indentHeuristic:: Set this option to `true` to enable experimental heuristics -- 2.43.2