diff --git a/gitconfig b/gitconfig
index 91ae62f3696fde515a1e78e42679942cee385825..97520aeb898c2e8fa1430023ca4ed063c57f3e95 100644
--- a/gitconfig
+++ b/gitconfig
@@ -3,6 +3,8 @@
     email = chris@codingallnight.com
 [push]
     default = simple
+[merge]
+    log = 20
 [credential]
     helper = cache --timeout=43200
 [core]
@@ -11,6 +13,7 @@
     editor = vim
 [diff]
     compactionHeuristic = true
+    algorithm = patience
 [alias]
     alias = config --get-regexp ^alias\\.
     stat = status