[PATCH 2/2] contrib/completion: add smerge to the mergetool completion candidates

From: David Aguilar <davvid@gmail.com>
Date: Apr 4, 2019, 07:34 UTC
Message-ID: <20190404073439.9558-2-davvid@gmail.com>
In-Reply-To: <20190404073439.9558-1-davvid@gmail.com>

Signed-off-by: David Aguilar <davvid@gmail.com>
---
 contrib/completion/git-completion.bash | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 ()

-- 
2.21.0.198.gfad8868f4e