Mercurial > ec-dotfiles
diff rc/hg @ 248:fbb03c862b63
Awesome merge.
author | Edho Arief <edho@myconan.net> |
---|---|
date | Tue, 08 Nov 2011 11:59:49 +0700 |
parents | 6a43fa890c93 |
children | 89a33efeb338 |
line wrap: on
line diff
--- a/rc/hg Tue Nov 08 11:56:49 2011 +0700 +++ b/rc/hg Tue Nov 08 11:59:49 2011 +0700 @@ -1,5 +1,5 @@ [ui] -username = Edho Prima Arief <edho@myconan.net> +username = Edho Arief <edho@myconan.net> merge = vimdiff verbose = true @@ -14,3 +14,5 @@ [hostfingerprints] bitbucket.org = 81:2b:08:90:dc:d3:71:ee:e0:7c:b4:75:ce:9b:6c:48:94:56:a1:fe +[defaults] +addremove = --similarity 100