.hgrc@1c1237f8b9e3 (annotated)
.hgrc
Mon, 16 Jun 2014 20:34:34 -0400
- author
- Meredith Howard <mhoward@roomag.org>
- date
- Mon, 16 Jun 2014 20:34:34 -0400
- branch
- mhoward-lt
- changeset 66
- 1c1237f8b9e3
- parent 62
- 5cc55bc23c8a
- child 84
- 04dfcc1f5eb6
- permissions
- -rw-r--r--
oops, that's not a comment
|
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
1 | [ui] |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
2 | username = Meredith Howard <mhoward@roomag.org> |
|
62
5cc55bc23c8a
Use a more manageable vimdiff
Meredith Howard <mhoward@roomag.org>
parents:
8
diff
changeset
|
3 | merge = vimdiff |
|
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
4 | |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
5 | [extensions] |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
6 | hgext.graphlog = |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
7 | rebase = |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
8 | color = |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
9 | record = |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
10 | pager = |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
11 | progress = |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
12 | fetch = |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
13 | flow = $HOME/.hgext/hgflow.py |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
14 | |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
15 | [pager] |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
16 | pager = LESS='FSRX' less |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
17 | |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
18 | [alias] |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
19 | fetch = pull --rebase |
|
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
20 | |
|
62
5cc55bc23c8a
Use a more manageable vimdiff
Meredith Howard <mhoward@roomag.org>
parents:
8
diff
changeset
|
21 | [merge-tools] |
|
5cc55bc23c8a
Use a more manageable vimdiff
Meredith Howard <mhoward@roomag.org>
parents:
8
diff
changeset
|
22 | vimdiff.executable = vim |
|
5cc55bc23c8a
Use a more manageable vimdiff
Meredith Howard <mhoward@roomag.org>
parents:
8
diff
changeset
|
23 | vimdiff.args = -d $base $local $output $other +close +close |
|
5cc55bc23c8a
Use a more manageable vimdiff
Meredith Howard <mhoward@roomag.org>
parents:
8
diff
changeset
|
24 | |
|
5cc55bc23c8a
Use a more manageable vimdiff
Meredith Howard <mhoward@roomag.org>
parents:
8
diff
changeset
|
25 | |
|
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
26 | %include ~/.hgrc.local |
