Mercurial > hg > config
annotate .hgrc @ 46:3d0ec6eb83fb
merge
author | Jeff Hammel <k0scist@gmail.com> |
---|---|
date | Sat, 27 Mar 2010 09:50:43 -0700 |
parents | 3b88a6c02421 |
children | bd91a6bc85cd |
rev | line source |
---|---|
0
f3ab51c79813
adding configuration from https://svn.openplans.org/svn/config_jhammel/
k0s <k0scist@gmail.com>
parents:
diff
changeset
|
1 [ui] |
27
3b88a6c02421
update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents:
18
diff
changeset
|
2 username = Jeff Hammel <k0scist@gmail.com> |
18 | 3 ignore = /home/jhammel/.hgignore |
27
3b88a6c02421
update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents:
18
diff
changeset
|
4 merge = internal:merge |
3b88a6c02421
update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents:
18
diff
changeset
|
5 |
3b88a6c02421
update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents:
18
diff
changeset
|
6 [defaults] |
3b88a6c02421
update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents:
18
diff
changeset
|
7 commit = -v |
3b88a6c02421
update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents:
18
diff
changeset
|
8 |
3b88a6c02421
update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents:
18
diff
changeset
|
9 [diff] |
3b88a6c02421
update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents:
18
diff
changeset
|
10 git = 1 |
3b88a6c02421
update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents:
18
diff
changeset
|
11 showfunc = 1 |
3b88a6c02421
update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents:
18
diff
changeset
|
12 unified = 8 |
18 | 13 |
14 [trusted] | |
15 users = jhammel | |
16 groups = jhammel | |
17 | |
18 [web] | |
19 allow_archive = zip, bz2 | |
20 contact = k0scist at gmail |