git: use newer diff options

.config/git/config

@@ -2,7 +2,7 @@
 	name = Thomas Dy
 	email = thatsmydoing@gmail.com
 [merge]
-	conflictstyle = diff3
+	conflictstyle = zdiff3
 [core]
 	autocrlf = input
 	hooksPath = ~/.config/git/hooks
@@ -17,7 +17,7 @@
 [color]
 	ui = true
 [diff]
-	algorithm = patience
+	algorithm = histogram
 [difftool]
 	prompt = false
 [difftool "difft"]