Mercurial > ec-dotfiles

annotate hg @ 24:75c0cedc20ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Edho Prima Arief <me@myconan.net>
date Wed, 05 Jan 2011 16:23:12 +0700
parents 83fb6c590b38
children bbd189f52beb
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
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
4
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
5 [merge-tools]
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
6 vimdiff.executable = vim
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
7 vimdiff.args = -d $base $local $output $other +close +close
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
8
14
48e869de3ebe Converter
Edho Prima Arief <me@myconan.net>
parents: 10
diff changeset
9 [extensions]
16
83fb6c590b38 Minor cleanup.
Edho Prima Arief <me@myconan.net>
parents: 14
diff changeset
10 hgext.convert =