[user]
	name = IBBoard
	email = dev@ibboard.co.uk
[branch]
	autosetupmerge = true
[diff]
[merge]
	tool = meld
[mergetool "meld"]
	cmd = meld \\\"$BASE\\\" \\\"$LOCAL\\\" \\\"$REMOTE\\\"
[diff]
	tool = meld
[difftool "meld"]
	cmd = meld \"\" \"\"
[difftool]
	prompt = false
[push]
	default = simple
[include]
    path = ~/.gitconfig-override