Mercurial > ec-dotfiles

annotate hg @ 42:ed0a40c3d1e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[hgignore] Let's forget .orig files.
author Edho Prima Arief <me@myconan.net>
date Tue, 26 Apr 2011 12:53:15 +0700
parents a914a2168196
children 7e462da3caa0
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
cd87be0968d9 Initial import.
Edho Prima Arief <me@myconan.net>
parents:
diff changeset
1 [ui]
cd87be0968d9 Initial import.
Edho Prima Arief <me@myconan.net>
parents:
diff changeset
2 username = Edho Prima Arief <me@myconan.net>
10
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
3 merge = vimdiff
34
a914a2168196 Merge, removed git support.
Edho Prima Arief <me@myconan.net>
parents: 27
diff changeset
4 verbose = true
10
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
5
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
6 [merge-tools]
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
7 vimdiff.executable = vim
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
8 vimdiff.args = -d $base $local $output $other +close +close
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
9
14
48e869de3ebe Converter
Edho Prima Arief <me@myconan.net>
parents: 10
diff changeset
10 [extensions]
16
83fb6c590b38 Minor cleanup.
Edho Prima Arief <me@myconan.net>
parents: 14
diff changeset
11 hgext.convert =
34
a914a2168196 Merge, removed git support.
Edho Prima Arief <me@myconan.net>
parents: 27
diff changeset
12 progress =