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

Merge branch 'Linux' of https://github.com/Geezus42/vimrc into Linux

Browse Source
This commit is contained in:
geezus
2021-06-30 14:59:46 -05:00
parent 29a3a22f6a 7d3bd53d7c
commit 9191883819
6 changed files with 306 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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