Mercurial > index.cgi > dotfiles
comparison .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 |
comparison
equal
deleted
inserted
replaced
86:463fe15a340f | 87:a835f8c36e93 |
---|---|
10 keyword = | 10 keyword = |
11 color = | 11 color = |
12 | 12 |
13 [merge-tools] | 13 [merge-tools] |
14 vimdiff.executable = vim | 14 vimdiff.executable = vim |
15 vimdiff.args = -d $base $local $output $other -c "wincmd J" | 15 vimdiff.args = -d $output $base $local $other -c "wincmd J" |
16 | 16 |
17 [trusted] | 17 [trusted] |
18 groups = help | 18 groups = help |
19 | 19 |
20 # Includes - here we pull in a config file for the particular host on which | 20 # Includes - here we pull in a config file for the particular host on which |