Mercurial > repos > other > linux
changeset 54:6b500877a2fc
Merge extra head
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Wed, 22 Mar 2017 20:45:30 +0000 |
| parents | 79646cea4c5f (diff) 73dcf413d9ab (current diff) |
| children | 231b9b290bfb |
| files | bashrc |
| diffstat | 4 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/bashrc Wed Mar 22 11:35:36 2017 +0000 +++ b/bashrc Wed Mar 22 20:45:30 2017 +0000 @@ -11,7 +11,7 @@ export EDITOR=/usr/bin/nano # Set 256-colour terminal support -export TERM="xterm-256color" +export TERM="screen-256color" #Import aliases test -s ~/.alias && . ~/.alias || true
--- a/hgrc Wed Mar 22 11:35:36 2017 +0000 +++ b/hgrc Wed Mar 22 20:45:30 2017 +0000 @@ -1,7 +1,6 @@ [ui] username = IBBoard <dev@ibboard.co.uk> merge = meld -logtemplate='{rev}:{node|short} - {age(date)} ({phase}){ifeq(p2rev, '-1', '', '\n Merge: {p1rev}:{p1node|short} && {p2rev}:{p2node|short}')}\n {tabindent(desc)}\n\n' [trusted] #Trust root (mainly for VPS running, where some repos are owned by root and we want to do "hg status" without sudo-ing) @@ -10,11 +9,9 @@ [alias] copush = !$HG commit $@ && $HG push -view = hgview [extensions] extdiff = -hgext.hgview = ~/.hgview.py bookmarks = hgext.convert= color =
--- a/profile Wed Mar 22 11:35:36 2017 +0000 +++ b/profile Wed Mar 22 20:45:30 2017 +0000 @@ -12,4 +12,4 @@ #Set us up for XCompose support of custom characters export GTK_IM_MODULE="ibus" export LS_OPTIONS="$LS_OPTIONS -p" -export TERM="xterm-256color" \ No newline at end of file +export TERM="screen-256color" \ No newline at end of file
--- a/tmux.conf Wed Mar 22 11:35:36 2017 +0000 +++ b/tmux.conf Wed Mar 22 20:45:30 2017 +0000 @@ -4,4 +4,5 @@ set -g status-fg white #set -g terminal-overrides 'xterm*:smcup@:rmcup@' #setw -g mode-mouse on -set-window-option -g xterm-keys on +setw -g xterm-keys on +setw -g allow-rename off \ No newline at end of file