change formatting

home/gitconfig

@@ -6,20 +6,16 @@
 	safecrlf = true
 	preloadindex = 1
 	pager = less -R
-
 [apply]
 	whitespace = fix
-
 [color]
 	ui = auto
 	interactive = true
 	status = true
 	branch = true
 	diff = true
-
 [push]
 	default = tracking
-
 [alias]
 	lol = log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
 	st = status -sb
@@ -32,20 +28,20 @@
 	dfc = diff --cached
 	mergemaster = mergetool
 	ci = commit -v
-  push-with-tags = "!git push && git push --tags"
-  pull-with-submodules = "!git pull && git submodule update --init"
-  rpull-with-submodules = "!git pull --rebase --stat && git submodule update --init"
-
+	push-with-tags = !git push && git push --tags
+	pull-with-submodules = !git pull && git submodule update --init
+	rpull-with-submodules = !git pull --rebase --stat && git submodule update --init
 [merge]
 	tool = vimdiff
-
 [mergetool "fugitive"]
 	cmd = fugitive vim -f -c \"Gdiff\" \"$MERGED\"
-
 [user]
 	email = dtodd@oceantech.com
 	name = David Todd
-
 [include]
 	path = ~/.githubtokens
 	path = ~/.dotoverrides/gitconfig
+[diff]
+	guitool = kdiff3
+[difftool "kdiff3"]
+	path = /usr/bin/kdiff3