view gitconfig @ 68:38843a80f378

Local cludge fix for bug 39 - incoming/outgoing showing content anyway https://bitbucket.org/sjl/hg-prompt/issues/39/outgoing-incoming-always-show-the-extra
author IBBoard <dev@ibboard.co.uk>
date Tue, 25 Apr 2017 13:13:36 +0100
parents dc844728d1d4
children c3320f06d412
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
[push]
	default = simple
[include]
    path = ~/.gitconfig-override