view rc/hgrc @ 552:6084b6b425ad

Merge from remote.
author nanaya <me@myconan.net>
date Tue, 14 Apr 2015 04:48:52 +0900
parents 44e0d733088c
children 0ea2c3c36438
line wrap: on
line source

[ui]
username = nanaya <me@myconan.net>
merge = vimdiff
verbose = true
ignore = ~/.hgignore_global
ignore.local = ~/.hgignore_global.local

[merge-tools]
vimdiff.executable = vim
vimdiff.args = -d $base $local $output $other +close +close

[extensions]
convert =
progress =
bookmarks =
mq =
rebase =
graphlog =
color =
record =
pager =
purge =
shelve =

[hostfingerprints]
bitbucket.org = 45:ad:ae:1a:cf:0e:73:47:06:07:e0:88:f5:cc:10:e5:fa:1c:f7:99

[defaults]
addremove = --similarity 100
push = -r .

[alias]
ll = log --style default

[pager]
pager = LESS=FRX less
attend = annotate, cat, diff, export, glog, log, qdiff, heads, ll

[bookmarks]
track.current = true

[color]
status.modified = magenta bold
status.added = green bold
status.removed = red bold
status.deleted = cyan bold
status.unknown = blue bold
status.ignored = black bold

%include ~/.hgrc.local