Mercurial > repos > other > linux
annotate 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 |
rev | line source |
---|---|
4 | 1 [user] |
2 name = IBBoard | |
3 email = dev@ibboard.co.uk | |
4 [branch] | |
5 autosetupmerge = true | |
6 [diff] | |
7 [merge] | |
8 tool = meld | |
9 [mergetool "meld"] | |
10 cmd = meld \\\"$BASE\\\" \\\"$LOCAL\\\" \\\"$REMOTE\\\" | |
11 [diff] | |
12 tool = meld | |
13 [difftool "meld"] | |
14 cmd = meld \"\" \"\" | |
15 [difftool] | |
16 prompt = false |