Mercurial > ec-dotfiles

annotate rc/hg @ 258:0cd601956a9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Edho Arief <edho@myconan.net>
date Sun, 20 Nov 2011 23:21:45 +0700
parents 6a43fa890c93
children 89a33efeb338
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]
136
7dd9ad7f977c New name! (???)
Edho Arief <edho@myconan.net>
parents: 127
diff changeset
2 username = Edho Arief <edho@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]
45
7e462da3caa0 [hg] Comment sometimes unavailable extension.
Edho Prima Arief <me@myconan.net>
parents: 34
diff changeset
11 #hgext.convert =
7e462da3caa0 [hg] Comment sometimes unavailable extension.
Edho Prima Arief <me@myconan.net>
parents: 34
diff changeset
12 #progress =
104
ed3d1b8e6f45 bitbucket fingerprint.
Edho Prima Arief <edho@myconan.net>
parents: 91
diff changeset
13
ed3d1b8e6f45 bitbucket fingerprint.
Edho Prima Arief <edho@myconan.net>
parents: 91
diff changeset
14 [hostfingerprints]
ed3d1b8e6f45 bitbucket fingerprint.
Edho Prima Arief <edho@myconan.net>
parents: 91
diff changeset
15 bitbucket.org = 81:2b:08:90:dc:d3:71:ee:e0:7c:b4:75:ce:9b:6c:48:94:56:a1:fe
ed3d1b8e6f45 bitbucket fingerprint.
Edho Prima Arief <edho@myconan.net>
parents: 91
diff changeset
16
142
6a43fa890c93 Rename autodetection.
Edho Arief <edho@myconan.net>
parents: 136
diff changeset
17 [defaults]
6a43fa890c93 Rename autodetection.
Edho Arief <edho@myconan.net>
parents: 136
diff changeset
18 addremove = --similarity 100