[user]
	name = Francisco J.
	email = nflamel@otrobloggeek.com
[color]
	diff = auto
	status = auto
	branch = auto
[core]
	excludesfile = <%= ENV['HOME'] %>/.gitignore
	editor = "/usr/local/bin/mvim -f"
	autocrlf = input
[apply]
	whitespace = fix
[format]
	pretty = %C(yellow)%h%Creset %s %C(red)(%cr)%Creset
[alias]
	co = checkout
	s = status
[github]
	user = franciscoj
	token = <%= print("GitHub API Token: "); STDOUT.flush; STDIN.gets.chomp %>

[user]
	name = Francisco J.
	email = nflamel@otrobloggeek.com
[color]
	diff = auto
	status = auto
	branch = auto
[core]
	excludesfile = <%= ENV['HOME'] %>/.gitignore
	editor = "/usr/local/bin/mvim -f"
	autocrlf = input
[apply]
	whitespace = fix
[format]
	pretty = %C(yellow)%h%Creset %s %C(red)(%cr)%Creset
[alias]
	co = checkout
	s = status
[github]
	user = franciscoj
	token = <%= print("GitHub API Token: "); STDOUT.flush; STDIN.gets.chomp %>
[merge]
	tool = vimdiff

Set vimdiff as the default mergetool
Set vimdiff as the default mergetool
