aboutsummaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2016-08-21 11:58:44 +1200
committerTom Ryder <tom@sanctum.geek.nz>2016-08-21 11:58:44 +1200
commit667ae3c7c5d4c5d4eaff3fbac4f8b3d01f4e365d (patch)
tree909db62dbb17c6913d00da7849d08b1b5b3f8b9f /git
parentFix some errors in dmp(1) manpage (diff)
downloaddotfiles-667ae3c7c5d4c5d4eaff3fbac4f8b3d01f4e365d.tar.gz
dotfiles-667ae3c7c5d4c5d4eaff3fbac4f8b3d01f4e365d.zip
Try the patience diff algorithm
Diffstat (limited to 'git')
-rw-r--r--git/gitconfig.m41
1 files changed, 1 insertions, 0 deletions
diff --git a/git/gitconfig.m4 b/git/gitconfig.m4
index 62c58f39..15be5052 100644
--- a/git/gitconfig.m4
+++ b/git/gitconfig.m4
@@ -17,6 +17,7 @@
compression = 9
[diff]
+ algorithm = patience
tool = vimdiff
[difftool]