diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim index 70ded12..232e1cf 100644 --- a/autoload/fugitive.vim +++ b/autoload/fugitive.vim @@ -5946,6 +5946,7 @@ function! fugitive#MapJumps(...) abort nnoremap cm :Git merge nnoremap cm :Git merge + nnoremap cmt :Git mergetool nnoremap cm? :help fugitive_cm nnoremap cz :Git stash diff --git a/doc/fugitive.txt b/doc/fugitive.txt index e4d04ae..83d0d16 100644 --- a/doc/fugitive.txt +++ b/doc/fugitive.txt @@ -111,7 +111,7 @@ that are part of Git repositories). change unless [!] is given. :Git difftool -y [args] Invoke `git diff [args]`, open each changed file in a - new tab, and invoke `:Gdiffsplit` against the + new tab, and invoke `:Gdiffsplit!` against the appropriate commit. *:Git-mergetool*