Deleted the crap from the mergetool

tmux/.tmux_BACKUP_4958.conf

@@ -1,41 +0,0 @@
-#change C-b to Ca
-unbind C-b
-set-option -g prefix C-a
-bind-key C-a send-prefix
-
-# split panes using | and -
-bind | split-window -h
-bind - split-window -v
-unbind '"'
-unbind %
-
-# stop tmux from renaming the window every time you run a command
-set-option -g allow-rename off
-set-option -g pane-active-border-fg blue
-
-# select panes with vim keys
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
-
-# change base from 0 to 1 for reachability
-set -g base-index 1
-
-# set vi modes
-set -g status-keys vi
-set -g mode-keys vi
-
-# enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
-# copy/paste: shift+left click to highlight, then shift+middle to past
-if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
-    'set -g mouse on' \
-    'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
-<<<<<<< HEAD
-#    'set -g mouse on; set -g mouse-utf8 on' \
-=======
-
-bind-key Tab last-window
-bind-key BTab previous-window
-
->>>>>>> 8ec84cb04cb2073f5741bc1073e53dfa4a088a50

tmux/.tmux_BASE_4958.conf

@@ -1,33 +0,0 @@
-#change C-b to Ca
-unbind C-b
-set-option -g prefix C-a
-bind-key C-a send-prefix
-
-# split panes using | and -
-bind | split-window -h
-bind - split-window -v
-unbind '"'
-unbind %
-
-# stop tmux from renaming the window every time you run a command
-set-option -g allow-rename off
-set-option -g pane-active-border-fg blue
-
-# select panes with vim keys
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
-
-# change base from 0 to 1 for reachability
-set -g base-index 1
-
-# set vi modes
-set -g status-keys vi
-set -g mode-keys vi
-
-# enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
-# copy/paste: shift+left click to highlight, then shift+middle to past
-if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
-    'set -g mouse on; set -g mouse-utf8 on' \
-    'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 

tmux/.tmux_LOCAL_4958.conf

@@ -1,34 +0,0 @@
-#change C-b to Ca
-unbind C-b
-set-option -g prefix C-a
-bind-key C-a send-prefix
-
-# split panes using | and -
-bind | split-window -h
-bind - split-window -v
-unbind '"'
-unbind %
-
-# stop tmux from renaming the window every time you run a command
-set-option -g allow-rename off
-set-option -g pane-active-border-fg blue
-
-# select panes with vim keys
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
-
-# change base from 0 to 1 for reachability
-set -g base-index 1
-
-# set vi modes
-set -g status-keys vi
-set -g mode-keys vi
-
-# enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
-# copy/paste: shift+left click to highlight, then shift+middle to past
-if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
-    'set -g mouse on' \
-    'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
-#    'set -g mouse on; set -g mouse-utf8 on' \

tmux/.tmux_REMOTE_4958.conf

@@ -1,37 +0,0 @@
-#change C-b to Ca
-unbind C-b
-set-option -g prefix C-a
-bind-key C-a send-prefix
-
-# split panes using | and -
-bind | split-window -h
-bind - split-window -v
-unbind '"'
-unbind %
-
-# stop tmux from renaming the window every time you run a command
-set-option -g allow-rename off
-set-option -g pane-active-border-fg blue
-
-# select panes with vim keys
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
-
-# change base from 0 to 1 for reachability
-set -g base-index 1
-
-# set vi modes
-set -g status-keys vi
-set -g mode-keys vi
-
-# enable mouse control (click wind, panes, resizable panes) - as of tmux 2.1
-# copy/paste: shift+left click to highlight, then shift+middle to past
-if-shell '[ $(echo "$(tmux -V | cut -d" " -f2) >= 2.1" | bc) -eq 1 ]' \
-    'set -g mouse on' \
-    'set -g mode-mouse on; set -g mouse-resize-pane on; set -g mouse-select-pane on; set -g mouse-select-window on' 
-
-bind-key Tab last-window
-bind-key BTab previous-window
-