geezuslucifer@gmail.com 7d3bd53d7c Merge remote-tracking branch 'refs/remotes/upstream/master' ... Conflicts: sources_non_forked/ale/autoload/ale.vim sources_non_forked/lightline.vim/doc/lightline.txt sources_non_forked/nerdtree/autoload/nerdtree.vim sources_non_forked/nerdtree/autoload/nerdtree/ui_glue.vim sources_non_forked/vim-fugitive/autoload/fugitive.vim sources_non_forked/vim-fugitive/doc/fugitive.txt		2021-06-30 14:46:47 -05:00
..
fugitive.vim	Merge remote-tracking branch 'refs/remotes/upstream/master'	2021-06-30 14:46:47 -05:00