merge test

2022-05-15 15:49:09 +08:00 · 2022-05-15 15:49:09 +08:00 · 9a41f49961
commit 9a41f49961
parent 8f98637f62
2 changed files with 5 additions and 4 deletions
--- a/README.md
+++ b/README.md
@ -3,8 +3,5 @@
 my vim cfg

 asdmertge 
-222
-32
-4545
-6567
+123
 sfads
--- 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'