diff --git a/README.md b/README.md index 47986f4..980f82c 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,5 @@ my vim cfg asdmertge -222 -32 -4545 -6567 +123 sfads diff --git a/plug.vim b/plug.vim index d84fdc2..6039a84 100644 --- a/plug.vim +++ b/plug.vim @@ -1,4 +1,8 @@ +let g:mergetool_prefer_revision = 'unmodified' +let g:mergetool_layout = 'LmR' + + let g:templates_directory = '~/.config/nvim/templates/' let g:smartim_default = 'com.apple.keylayout.ABC'