Add vcs conflict marker unimpaired binding (#2932)

close #2886

autoload/SpaceVim/layers/VersionControl.vim

@@ -41,6 +41,12 @@ function! SpaceVim#layers#VersionControl#config() abort
       autocmd BufReadPost,BufWritePost,CursorMoved,CursorMovedI * silent call s:record()
     augroup END
   endif
+  nnoremap <silent> [n :call <SID>Context(1)<CR>
+  nnoremap <silent> ]n :call <SID>Context(0)<CR>
+endfunction
+
+function! s:Context(reverse) abort
+  call search('^\(@@ .* @@\|[<=>|]\{7}[<=>|]\@!\)', a:reverse ? 'bW' : 'W')
 endfunction
 
 function! SpaceVim#layers#VersionControl#set_variable(var) abort

docs/cn/documentation.md

@@ -932,6 +932,8 @@ Denite/Unite 是一个强大的信息筛选浏览器，这类似于 Emacs 中的
 | `] SPC` | 在当前行或已选区域下方添加空行                 |
 | `[ b`   | 跳至前一 buffer                                |
 | `] b`   | 跳至下一 buffer                                |
+| `[ n`   | 跳至前一冲突位置                               |
+| `] n`   | 跳至下一冲突位置                               |
 | `[ f`   | 跳至文件夹中的前一个文件                       |
 | `] f`   | 跳至文件夹中的下一个文件                       |
 | `[ l`   | 跳至前一个错误处                               |

docs/documentation.md

@@ -953,6 +953,8 @@ Similar to easymotion or `f` in vimperator for firefox, this mode allows one to
 | `] SPC`  | Insert space below                                      |
 | `[ b`    | Go to previous buffer                                   |
 | `] b`    | Go to next buffer                                       |
+| `[ n`    | Go to previous conflict marker                          |
+| `] n`    | Go to next conflict marker                              |
 | `[ f`    | Go to previous file in directory                        |
 | `] f`    | Go to next file in directory                            |
 | `[ l`    | Go to the previous error                                |