view .hgrc @ 87:a835f8c36e93

Fixed PS1 & vimdiff * PS1 had nonprintable characters in it, but bash didn't know that; so it wrapped in all the wrong places. * vimdiff was using different window placements than kdiff would use, leading to much confusion. This way feels nicer, leaving the "good" output file at the bottom.
author Steve Huston <huston@astro.princeton.edu>
date Wed, 01 May 2013 14:08:33 -0400
parents 463fe15a340f
children 21e0ab41e180
line wrap: on
line source

# Global .hgrc - see bottom for local information

[ui]
username = Steve Huston <huston@astro.princeton.edu>
merge = vimdiff
editor = $HOME/bin/hgeditor

[extensions]
convert =
keyword =
color =

[merge-tools]
vimdiff.executable = vim
vimdiff.args = -d $output $base $local $other -c "wincmd J"

[trusted]
groups = help

# Includes - here we pull in a config file for the particular host on which
# we're running, if there is one.  This lets us set specific things on
# specific hosts fairly easily.  $HOST must be defined in the environment
# (bash's built-in $HOSTNAME is insufficient)
%include $HOME/.hgrc.d/$HOST.rc