From 73be33c5556d046046652534a12e649b08bedcfb Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc>
Date: Wed, 13 Dec 2017 15:16:42 -0600
Subject: [PATCH 1/3] Updated tmux mouse option

---
 tmux/.tmux.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index 1a1dda3..aadfd0c 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -29,5 +29,6 @@ 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 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' \

From 2bca7516f95a05971c3b761e43193e5d7cbc1578 Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc>
Date: Wed, 13 Dec 2017 15:21:42 -0600
Subject: [PATCH 2/3] Cleaned up cruft from merge

---
 tmux/.tmux.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf
index c8152f1..9cf6ff1 100644
--- a/tmux/.tmux.conf
+++ b/tmux/.tmux.conf
@@ -31,11 +31,8 @@ set -g mode-keys vi
 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

From 5080ea55a5ccaed74e3c0213796ebfc8384582da Mon Sep 17 00:00:00 2001
From: jond <jon@nhdc>
Date: Wed, 13 Dec 2017 15:23:08 -0600
Subject: [PATCH 3/3] Deleted the crap from the mergetool

---
 tmux/.tmux_BACKUP_4958.conf | 41 -------------------------------------
 tmux/.tmux_BASE_4958.conf   | 33 -----------------------------
 tmux/.tmux_LOCAL_4958.conf  | 34 ------------------------------
 tmux/.tmux_REMOTE_4958.conf | 37 ---------------------------------
 4 files changed, 145 deletions(-)
 delete mode 100644 tmux/.tmux_BACKUP_4958.conf
 delete mode 100644 tmux/.tmux_BASE_4958.conf
 delete mode 100644 tmux/.tmux_LOCAL_4958.conf
 delete mode 100644 tmux/.tmux_REMOTE_4958.conf

diff --git a/tmux/.tmux_BACKUP_4958.conf b/tmux/.tmux_BACKUP_4958.conf
deleted file mode 100644
index c8152f1..0000000
--- a/tmux/.tmux_BACKUP_4958.conf
+++ /dev/null
@@ -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
diff --git a/tmux/.tmux_BASE_4958.conf b/tmux/.tmux_BASE_4958.conf
deleted file mode 100644
index 1a1dda3..0000000
--- a/tmux/.tmux_BASE_4958.conf
+++ /dev/null
@@ -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' 
diff --git a/tmux/.tmux_LOCAL_4958.conf b/tmux/.tmux_LOCAL_4958.conf
deleted file mode 100644
index aadfd0c..0000000
--- a/tmux/.tmux_LOCAL_4958.conf
+++ /dev/null
@@ -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' \
diff --git a/tmux/.tmux_REMOTE_4958.conf b/tmux/.tmux_REMOTE_4958.conf
deleted file mode 100644
index e89d7bc..0000000
--- a/tmux/.tmux_REMOTE_4958.conf
+++ /dev/null
@@ -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
-