view gitconfig @ 17:483a45fc520c

Fix multiple heads from forgotten changes on server
author IBBoard <dev@ibboard.co.uk>
date Sun, 10 Aug 2014 19:55:58 +0100
parents c7241e9025b8
children 9bce7362e609
line wrap: on
line source

[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