[extensions] # Confusingly, listing an extension here (even with no arguments) turns it on #graphviz = ~/.mercurial/extensions/graphviz.py color = purge = hgext.mq = hgext.graphlog = # Attic and record are used for 'shelve' attic = ~/.mercurial/extensions/hgattic/attic.py hgext.record = #shelve = ~/.mercurial/extensions/hgshelve/hgshelve.py info = ~/.mercurial/extensions/info.py rebase = hgext.bookmarks = transplant = #hgext.zeroconf = #hgext.convert= #hgext.hgk = progress = [ui] username = David Wolever merge = diffmerge verbose = True archivemeta = True [merge-tools] vimdiff.args = $local $other $base $output vimdiff.checkchanged = True vimdiff.premerge = True diffmerge.args = --result=$output -t1="Local Version" -t2=$output -t3="Other Version" --caption=$output $local $base $other diffmerge.binary = False diffmerge.symlinks = False diffmerge.gui = True diffmerge.premerge = False kidff3.args = $base $local $other -o $output [alias] bm = bookmark conflicts = resolve -l resolved = resolve -m renames = stat -Ca nudge = push --rev . switch = setpath node = log --template "{node}\n" -r . [diff] # prevent qrefresh from updating timestamps nodates=1 # force all patches to always be in git format git=1 [color] diff.trailingwhitespace = none #qseries.unapplied = blue bold [web] allow_push = * push_ssl = False [auth] massuni.schemes = https massuni.prefix = massuni.com/repos/ massuni.username = wolever bitbucket.schemes = https bitbucket.prefix = bitbucket.org bitbucket.username = wolever %include .hgrc.local