anchor.diff:  <% else %>
   	autocrlf = input
   <% end %>
  -<% if RUBY_PLATFORM =~ /(win32|mingw32)/ %>
  +
   [branch]
   	autosetuprebase = always
  +
  +<% if RUBY_PLATFORM =~ /(win32|mingw32)/ %>
   [diff]
   	tool = bc
   [difftool]
   	prompt = false
  +[difftool "bc"]
  +	path = c:/Program Files (x86)/Beyond Compare 4/bcomp.exe
  +
   [merge]
   	tool = bc
   [mergetool]
   	keepBackup = false
  -[difftool "bc"]
  -	path = c:/Program Files (x86)/Beyond Compare 4/bcomp.exe
   [mergetool "bc"]
   	path = c:/Program Files (x86)/Beyond Compare 4/bcomp.exe
   <% elsif RUBY_PLATFORM =~ /darwin/ %>
   [diff]
   	tool = Kaleidoscope
  +[difftool]
  +	prompt = false
   [difftool "Kaleidoscope"]
   	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
  -[difftool]
  -	prompt = false
  +
   [merge]
   	tool = Kaleidoscope
   [mergetool]
  
positive.code: 	ll = log --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(cyan)- %an%C(reset)%C(bold yellow)%d%C(reset)' --decorate --numstat
  	fld = log --word-diff -u
  
  	# list colors...
  	#lc = log --pretty=format:'%Credred%Creset %Cgreengreen%Creset %C(Yellow)yellow%Creset %Cblueblue%Creset %C(magenta)magenta%Creset %C(cyan)cyan%Creset %C(white)white%Creset %C(dim white)dim white%Creset %C(bold white)bold white%Creset'
  
  	# Diff a rev
  	diffr  = "!f() { git diff "$1"^.."$1" --word-diff; }; f"
  	diffrt  = "!f() { git difftool "$1"^.."$1" --word-diff; }; f"
  
negative.code: 
  	# improved grep display
  	g = grep --break --heading --line-number
  
  [grep]
  	extendRegexp = true
  	lineNumber = true
  
  <% if RUBY_PLATFORM =~ /darwin/ %>
  [credential]
  	helper = osxkeychain
  