From: Iain Patterson <me@iain.cx>
Date: Wed, 12 Dec 2007 16:27:59 +0000 (+0000)
Subject: Ignore whitespace when diffing.
X-Git-Url: http://git.iain.cx/?a=commitdiff_plain;h=7bf0efc96c2bb133d2d884030ac39437f8ae7895;p=profile.git

Ignore whitespace when diffing.
Use vertical diffs by default where possible.


git-svn-id: https://svn.cambridge.iain.cx/profile/trunk@87 6be0d1a5-5cfe-0310-89b6-964be062b18b
---

diff --git a/.vimrc b/.vimrc
index 3396ecd..1d7d9d7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -244,6 +244,9 @@ if has("win32")
   se guifont=Bitstream_Vera_Sans_Mono:h10:cANSI
 endif
 
+" Ignore whitespace when diffing.
+se diffopt=filler,iwhite
+
 " Expand window when doing a vertical diff.
 if &diff
   let &columns = 164
@@ -385,6 +388,9 @@ endif
 if version >= "700"
 version 7.0
 
+" Make diffs vertical by default.
+se diffopt+=vertical
+
 " Set size of numbers column.
 se numberwidth=5