Mercurial > dotfiles
view .hgrc @ 338:3f3d52956ff7
hgrc: use detailed merge markers by default
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 18 Jul 2014 20:15:41 -0400 |
parents | 7a736d851718 |
children | 1b4b235482c5 |
line wrap: on
line source
[extensions] hgext.bookmarks= hgext.color= hgext.convert= hgext.highlight= hgext.histedit= hgext.mq= hgext.parentrevspec= hgext.patchbomb= hgext.progress= hgext.purge= hgext.rebase= hgext.record= hgext.schemes= hgext.shelve= hgext.transplant= hggit= hgsubversion= hg_remotebranches= [alias] ll=log --graph --style compact --limit 6 -r 'sort((::. or bookmark() or heads(upstream())), "-rev")' upstream-bookmarks = log -r 'bookmark() and upstream()' --template '{bookmarks}\n' utip = log -r 'limit(heads(upstream()), 1)' egrep = !$HG locate -0 '$2' $3 $4 $5 $6 $7 $8 $9 | xargs -0 egrep -H '$1' wc-out = log -r 'ancestors(.) and not upstream()' wc-email = email -r 'ancestors(.) and not upstream()' [ui] username = Augie Fackler <raf@durin42.com> ignore = ~/.hgglobalignore usehttp2=true mergemarkers = detailed [defaults] qimport = --git qrefresh = --git annotate = -nu heads = --style default serve = -v outgoing = --graph # --graph is breaking incoming, need to investigate # incoming = --graph diff = -p [diff] git=1 [bookmarks] track.current = 1 [web] port=7000 allow_archive = bz2 zip [color] status.ignored = magenta bold qseries.unapplied = magenta bold [phases] publish=false