• file
• latest
• revisions
• annotate
• diff
• comparison
• raw

.hgrc@0538d5699cd7 (annotated)

.hgrc

Mon, 05 Jan 2015 15:39:48 -0500

author

Meredith Howard <mhoward@roomag.org>

date

Mon, 05 Jan 2015 15:39:48 -0500

branch

mhoward-lt

changeset 162

0538d5699cd7

parent 84

04dfcc1f5eb6

permissions

-rw-r--r--

Merge from default

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>
79 4635b3f5bc23 Easier vimdiff defaults 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 =
80 e2d834280dae Enable mq extension Meredith Howard <mhoward@roomag.org> parents: 79 diff changeset	7	mq =
8 ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	8	rebase =
ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	9	color =
ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	10	record =
ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	11	pager =
ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	12	progress =
ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	13	fetch =
ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	14	flow = $HOME/.hgext/hgflow.py
ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	15
ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	16	[pager]
ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	17	pager = LESS='FSRX' less
ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	18
ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	19	[alias]
ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	20	fetch = pull --rebase
ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	21
79 4635b3f5bc23 Easier vimdiff defaults Meredith Howard <mhoward@roomag.org> parents: 8 diff changeset	22	[merge-tools]
4635b3f5bc23 Easier vimdiff defaults Meredith Howard <mhoward@roomag.org> parents: 8 diff changeset	23	vimdiff.executable = vim
4635b3f5bc23 Easier vimdiff defaults Meredith Howard <mhoward@roomag.org> parents: 8 diff changeset	24	vimdiff.args = -d $base $local $output $other +close +close
4635b3f5bc23 Easier vimdiff defaults Meredith Howard <mhoward@roomag.org> parents: 8 diff changeset	25	vimdiff.check = changed, conflicts
4635b3f5bc23 Easier vimdiff defaults Meredith Howard <mhoward@roomag.org> parents: 8 diff changeset	26
4635b3f5bc23 Easier vimdiff defaults Meredith Howard <mhoward@roomag.org> parents: 8 diff changeset	27
8 ba72a71f23e6 Add mercurial config and hgflow extension Meredith Howard <mhoward@roomag.org> parents: diff changeset	28	%include ~/.hgrc.local