Mercurial > index.cgi > dotfiles

annotate .hgrc @ 84:fe021064d723

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adding 'hgeditor' to repo & environment
author Steve Huston <huston@srhuston.net>
date Wed, 24 Apr 2013 11:40:27 -0400
parents e2f98d3b4b5b
children c75fecccc3e5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
73
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
1 [ui]
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
2 username = Steve Huston <huston@srhuston.net>
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
3 merge = vimdiff
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
4
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
5 [extensions]
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
6 convert =
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
7 keyword =
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
8 color =
81
e2f98d3b4b5b Removing hgsubversion from .hgrc - at least for now
Steve Huston <huston@srhuston.net>
parents: 73
diff changeset
9 # Until I find a nice way to get hgsubversion installed other places, this
e2f98d3b4b5b Removing hgsubversion from .hgrc - at least for now
Steve Huston <huston@srhuston.net>
parents: 73
diff changeset
10 # one's out. Need to decide if I really need it too, I might not.
e2f98d3b4b5b Removing hgsubversion from .hgrc - at least for now
Steve Huston <huston@srhuston.net>
parents: 73
diff changeset
11 # hgsubversion =
73
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
12
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
13 [merge-tools]
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
14 vimdiff.executable = vim
09b915fb36b8 * JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff changeset
15 vimdiff.args = -d $base $local $output $other -c "wincmd J"