ld/amix-vimrc-mirror
1
0
Fork 0
mirror of https://github.com/amix/vimrc synced 2025-07-14 23:55:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/upstream/master'

Browse Source 
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
This commit is contained in:
geezuslucifer@gmail.com
2021-06-30 14:46:47 -05:00
parent 1cca3b1df2 597b7acdc0
commit 7d3bd53d7c
6 changed files with 214 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources_non_forked/vim-fugitive/doc/fugitive.txt
View File

@ -139,6 +139,7 @@ that are part of Git repositories).
*:Git_mergetool*
:Git mergetool [args] Like |:Git_difftool|, but target merge conflicts.
<<<<<<< HEAD
<<<<<<< HEAD
*:Git_push*
:Git push [args] Invoke git-push, load the results into the |quickfix|
@ -174,6 +175,8 @@ that are part of Git repositories).
=======
=======
>>>>>>> 597b7acdc0316524c7c65c79d4dc9bf3f5cfce70
=======
>>>>>>> master
*:Ggrep* *:Gcgrep* *:Git_grep*
:Ggrep[!] [args] |:grep|[!] with git-grep as 'grepprg'.
:Git[!] grep [args]