Mercurial > public > dotfiles
view hg/.hgrc @ 13:0c225d280b06
Merge.
author | Brian Neal <bgneal@gmail.com> |
---|---|
date | Tue, 04 Jun 2013 19:25:17 -0500 |
parents | 71f65ccb96f0 |
children | 9b01ad28a5c3 |
line wrap: on
line source
[ui] username = Brian Neal <bgneal@gmail.com> editor = vim ssh = ssh -C merge = kdiff3 [extensions] color = graphlog = hgext.extdiff = hgext.convert = pager = progress = [extdiff] cmd.kdiff3 = [merge-tools] kdiff3.args =--L1 base --L2 local --L3 other $base $local $other -o $output [convert] svn.trunk = madeira/trunk svn.branches = madeira/branches svn.tags = madeira/tags [pager] pager = LESS='FRX' less