motiejus/dotfiles

commit def982ac4d81700a03ad9f0fc4233437f3d65b77 (tree)
parent 5fe99dc5df87b1edd48782ca477afe66486aef73
Author: Tim Pope <code@tpope.net>
Date:   Fri, 10 Jan 2020 20:22:56 -0500

Softly deprecate :Gmerge for quickfix conflicts

Diffstat:
M
autoload/fugitive.vim
 | 
1
+

1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
@@ -3676,6 +3676,7 @@ function! s:MergeRebase(cmd, bang, mods, args, ...) abort
     if a:cmd =~# '^merge' && empty(args) &&
           \ (had_merge_msg || isdirectory(fugitive#Find('.git/rebase-apply', dir)) ||
           \  !empty(s:TreeChomp(dir, 'diff-files', '--diff-filter=U')))
+      return 'echohl WarningMsg|echo ":Git merge for loading conflicts is deprecated in favor of :Git mergetool"|echohl NONE|silent Git' . (a:bang ? '!' : '') . ' mergetool'
       let cmd = g:fugitive_git_executable.' diff-files --name-status --diff-filter=U'
     else
       let cmd = s:UserCommand(dir, argv)