diff options
| author | David Aguilar <davvid@gmail.com> | 2019-04-04 00:34:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-04 18:21:26 +0900 |
| commit | f57b2ae348950c0048f0091093f9d1e095d11d08 (patch) | |
| tree | b4168c0348e392680bcb3036dd7bd66743631437 /contrib/completion/git-completion.bash | |
| parent | eb12adc74cf22add318f884072be2071d181abaa (diff) | |
| download | git-f57b2ae348950c0048f0091093f9d1e095d11d08.tar.gz | |
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>
Diffstat (limited to 'contrib/completion/git-completion.bash')
| -rw-r--r-- | contrib/completion/git-completion.bash | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 976e4a6548..b6d69bcaeb 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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 () |