Update vimrc and gitconfig

gitconfig

@@ -27,6 +27,7 @@
 	l = log
 	ls = !git branch --format '%(refname:short)' | fzf
 	mr = !git merge $(git rb)
+	mt = merge -s recursive -X theirs
 	nb = checkout -b
 	nuke = reset --hard
 	p = push

vimrc

@@ -28,7 +28,6 @@ set splitbelow
 set splitright
 set encoding=utf-8
 set hidden
-set history=1000
 set nowrap
 set smartindent
 set copyindent
@@ -61,11 +60,11 @@ set ballooneval
 set balloonevalterm
 set scrolloff=15
 set dictionary=/usr/share/dict/words
+" See :help thesaurus
+set thesaurus=$HOME/Documents/thesaurus/thesaurus_pkg/thesaurus.txt
 set shortmess+=I
 set updatetime=250
 set pastetoggle=<f2>
-" See :help thesaurus
-set thesaurus=$HOME/Documents/thesaurus/thesaurus_pkg/thesaurus.txt
 set pumheight=200
 set completeopt=menu,menuone,popup,noselect
 set completepopup=width:300,height:50,align:item,border:off