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: [user]
  	name = David Mohundro
  	email = david@mohundro.com
  [color]
  	diff = auto
  	status = auto
  	branch = auto
  	ui = auto
  [core]
  <% if RUBY_PLATFORM =~ /darwin/ %>
  	editor = mvim -v
  
negative.code: 	co = checkout
  	df = diff --word-diff
  	dc = diff --cached --word-diff
  	vdf = difftool --dir-diff
  	vdfc = difftool --dir-diff --cached
  
  