# HG changeset patch # User Meredith Howard # Date 1497136752 25200 # Node ID 1698d432a2eb56f7de54cb32a42ba8a37e768ab4 # Parent bcc7823e89913ee79b5501967309e416f8668fdf add gh schemes, why not diff --git a/.hgrc b/.hgrc --- a/.hgrc +++ b/.hgrc @@ -1,6 +1,6 @@ [ui] -username = Meredith Howard -merge = vimdiff +username = Meredith Howard +merge = vimdiff logtemplate = "{phaseset} -{label('logcust.decorate', decorate)} {desc|strip|firstline} {label('logcust.date', "({date|age})")} {label('logcust.user' , "<{author|person}>")}\n" [extensions] @@ -24,21 +24,25 @@ ctags = !~/bin/git-ctags [merge-tools] vimdiff.executable = vim -vimdiff.args = -d $base $local $output $other +close +close -vimdiff.check = changed, conflicts +vimdiff.args = -d $base $local $output $other +close +close +vimdiff.check = changed, conflicts [diff] -git = true +git = true showfunc = true +[schemes] +gh = git://github.com/ +gh+ssh = git+ssh://github.com/ + [color] -diff.hunk = cyan -log.changeset = magenta -logcust.date = green -logcust.user = cyan +diff.hunk = cyan +log.changeset = magenta +logcust.date = green +logcust.user = cyan logcust.decorate = yellow -changeset.draft = dim -changeset.secret = dim underline +changeset.draft = dim +changeset.secret = dim underline [templatealias] phaseset = "{label("changeset.{phase}", rev)}:{label('log.changeset', node|short)}"