no diff tool section here

we should bring this up later instead, it’s just confusing

Author: schacon

en/book/01-introduction/chapter1.asc

@@ -237,14 +237,6 @@ Now that your identity is set up, you can configure the default text editor that
 
   $ git config --global core.editor emacs
 
-==== Your Diff Tool
-
-Another useful option you may want to configure is the default diff tool to use to resolve merge conflicts. Say you want to use vimdiff:
-
-  $ git config --global merge.tool vimdiff
-
-Git accepts kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff as valid merge tools. You can also set up a custom tool; see <<_git_tools>> for more information about doing that.
-
 ==== Checking Your Settings
 
 If you want to check your settings, you can use the `git config --list` command to list all the settings Git can find at that point: