Updated aliases for spv

dotfiles/Xresources

@@ -1,5 +1,5 @@
 ! URxvt.font: xft:hack:size=14
-URxvt.font: xft:hack:size=12
+URxvt.font: xft:hack:size=13
 
 URxvt*inheritPixmap: true
 URxvt*transparent: true

dotfiles/gitconfig

@@ -7,3 +7,8 @@
 	editor = nvim
 [push]
 	default = simple
+[merge]
+	tool = vimdiff
+	conflictstyle = diff3
+[mergetool]
+	prompt = false

dotfiles/vimrc

@@ -25,6 +25,9 @@ set hlsearch
 
 autocmd VimResized * wincmd =
 autocmd BufNewFile,BufRead .* set syntax=sh
+autocmd Filetype css,html,tex,txt set tabstop=2 shiftwidth=2 expandtab
+autocmd BufNewFile,BufRead *.md set filetype=markdown
+autocmd Filetype markdown set textwidth=0
 
 " vim-plug {{{ "
 " plug auto-install
@@ -156,7 +159,7 @@ nnoremap <leader>DA "+ggdG
 " reload file
 nnoremap <leader>e :e<CR>
 " find merge conflicts
-nnoremap <leader>fc /[<>=]\{7\}<CR>
+nnoremap <leader>fc /[<>=\|]\{7\}<CR>
 " reload folds
 nnoremap <leader>ff :set foldmethod=marker<CR> zM
 " toggle search highlighting
@@ -204,7 +207,6 @@ nnoremap <leader>Y "+Y
 " Local Mappings {{{ "
 let maplocalleader="-"
 autocmd Filetype c inoremap <localleader>s struct pixel
-autocmd Filetype css,html,tex set tabstop=2 shiftwidth=2 expandtab
 
 " tex {{{ "
 autocmd Filetype tex inoremap <localleader>D \Delta
@@ -233,4 +235,6 @@ autocmd Filetype tex inoremap <localleader>wx $w(x)$
 autocmd Filetype tex inoremap <localleader>tx $t(x)$
 " }}} tex "
 
+autocmd Filetype md inoremap <localleader>x 0f[lRX
+
 " }}} Local Mappings "