Mercurial > public > dotfiles
changeset 13:0c225d280b06
Merge.
author | Brian Neal <bgneal@gmail.com> |
---|---|
date | Tue, 04 Jun 2013 19:25:17 -0500 |
parents | 71f65ccb96f0 (diff) d428a965f322 (current diff) |
children | 357906c82c1f |
files | |
diffstat | 3 files changed, 47 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgignore Tue Jun 04 19:25:17 2013 -0500 @@ -0,0 +1,5 @@ +syntax: glob + +vim/vimfiles/.netrwhist +vim/vimfiles/bundle/ctrlp.vim/doc/tags +*.swp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/hg/.hgrc Tue Jun 04 19:25:17 2013 -0500 @@ -0,0 +1,27 @@ +[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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/python/.pythonstartup Tue Jun 04 19:25:17 2013 -0500 @@ -0,0 +1,15 @@ +# python startup file +import readline +import rlcompleter +import atexit +import os +# tab completion +readline.parse_and_bind('tab: complete') +# history file +histfile = os.path.join(os.environ['HOME'], '.pythonhistory') +try: + readline.read_history_file(histfile) +except IOError: + pass +atexit.register(readline.write_history_file, histfile) +del os, histfile, readline, rlcompleter