From: Jannik ZANDER <jzander@grundfos.com>
Date: Fri, 8 Jun 2018 07:03:39 +0000 (+0200)
Subject: Bash cleanup
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=33624a7b12947335339d9b7e44061828d4b10324;p=dotfiles.git

Bash cleanup
---

diff --git a/.config/git/config b/.config/git/config
index 7736dce..511ad08 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -84,8 +84,8 @@
 	tool = vimdiff
 #	tool = bc
 [merge]
-#	tool = vimdiff
-	tool = bc
+	tool = vimdiff
+#	tool = bc
 [difftool "vimdiff"]
 	prompt = false
 	conflictstyle = diff3
@@ -97,7 +97,6 @@
 [mergetool "bc"]
 	path = bcompare
 	trustExitCode = false
-	trustExitCode = false
 [init]
 	templatedir = ~/.config/git/templates
 [core]
diff --git a/.vimrc b/.vimrc
index 7263fea..81c1ef4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -41,7 +41,7 @@ Plug 'michaeljsmith/vim-indent-object'
 "Plug 'mileszs/ack.vim'
 "Plug 'jeetsukumaran/vim-filesearch'
 "Plug 'haya14busa/incsearch.vim'
-"Plug 'altercation/vim-colors-solarized'
+Plug 'altercation/vim-colors-solarized'
 Plug 'editorconfig/editorconfig-vim'
 "Plug 'johnsyweb/vim-makeshift'
 "Plug 'tfnico/vim-gradle'
@@ -342,10 +342,10 @@ if (&t_Co > 2 || has("gui_running")) && has("syntax")
   endif
 endif
 
-"colorscheme solarized
-"let g:solarized_diffmode="high"
-"let g:solarized_termtrans=1
-"let g:solarized_menu=0
+colorscheme solarized
+let g:solarized_diffmode="high"
+let g:solarized_termtrans=1
+let g:solarized_menu=0
 set background=dark
 set t_Co=256
 " }}}1