Mercurial > index.cgi > dotfiles
annotate .hgrc @ 76:1660b93d4220
* Added warning for subversion to help converting to Hg
author | huston@80426f53-59d1-405d-934b-f07cd76f4a1a |
---|---|
date | Sun, 21 Apr 2013 18:06:42 +0000 |
parents | 09b915fb36b8 |
children | e2f98d3b4b5b |
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 = |
09b915fb36b8
* JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff
changeset
|
9 hgsubversion = |
09b915fb36b8
* JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff
changeset
|
10 |
09b915fb36b8
* JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff
changeset
|
11 [merge-tools] |
09b915fb36b8
* JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff
changeset
|
12 vimdiff.executable = vim |
09b915fb36b8
* JT-65 alias for Wine on the home (ham shack) computer
huston@80426f53-59d1-405d-934b-f07cd76f4a1a
parents:
diff
changeset
|
13 vimdiff.args = -d $base $local $output $other -c "wincmd J" |