line ending setup

.gitconfig

@@ -36,9 +36,14 @@
 
 [diff]
  # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
-  # instead of a/b/c/d as prefixes for patches
+ # instead of a/b/c/d as prefixes for patches
   mnemonicprefix = true
 
+[merge]
+	tool = extMerge
+[merge "extMerge"]
+	cmd = 'vim -d "$BASE" "$LOCAL" "$REMOTE" "$MERGED"'
+
 [advice]
   statusHints = false
 
@@ -62,6 +67,7 @@
   # More info: <http://www.git-tower.com/blog/make-git-rebase-safe-on-osx/>
   trustctime = false
 	editor = gvim
+	autocrlf = true
 
 [color]
   # Use colors in Git commands that are capable of colored output when
@@ -72,15 +78,18 @@
   current = yellow reverse
   local = yellow
   remote = green
+
 [color "diff"]
   meta = yellow bold
   frag = magenta bold
   old = red bold
   new = green bold
+
 [color "status"]
   added = yellow
   changed = green
   untracked = cyan
+
 [merge]
   # Include summaries of merged commits in newly created merge commit messages
   log = true