Bash cleanup

diff --git a/.config/git/config b/.config/git/config
index 7736dce93634dbb8142db89563b73ba6918ca26e..511ad087ab02335a527984aac5230208b5201c53 100644 (file)
--- 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 7263feae56246fd6f7d6796a3004625744d8c4e9..81c1ef4abf4b8f2ec43db3a056730b3aefad5655 100644 (file)
--- 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