зеркало из https://github.com/microsoft/git.git
contrib/completion: add smerge to the mergetool completion candidates
Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
eb12adc74c
Коммит
f57b2ae348
|
@ -1501,7 +1501,8 @@ _git_diff ()
|
|||
}
|
||||
|
||||
__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
|
||||
tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare
|
||||
tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc
|
||||
codecompare smerge
|
||||
"
|
||||
|
||||
_git_difftool ()
|
||||
|
|
Загрузка…
Ссылка в новой задаче