Re: [PATCH 09/14] difftool: move 'git-difftool' out of contrib
flat view
From: Markus Heidelberg <hidden>
Date: 2016-06-15 22:46:34
David Aguilar, 06.04.2009:
quoted hunk ↗ jump to hunk
diff --git a/Documentation/config.txt b/Documentation/config.txt +diff.tool:: + Controls which diff tool is used. `diff.tool` overrides + `merge.tool` when used by linkgit:git-difftool[1] and has + the same valid values as `merge.tool`.
+kompare -tortoisemerge