Mercurial > repos > other > linux
view gitconfig @ 42:767cffc0558f
Merge changes from other machine
author | IBBoard <dev@ibboard.co.uk> |
---|---|
date | Wed, 15 Feb 2017 14:33:33 +0000 |
parents | 9bce7362e609 |
children | dc844728d1d4 |
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