contrib/completion: add smerge to the mergetool completion candidates

davvid · gitster · commit f57b2ae34895 · 2019-04-04T18:21:26.000+09:00
Signed-off-by: David Aguilar &lt;davvid@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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 ()

Original file line number	Diff line number	Diff line change
`@@ -1501,7 +1501,8 @@ _git_diff ()`
`1501`	`1501`	`}`
`1502`	`1502`
`1503`	`1503`	`__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff`
`1504`		`- tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc codecompare`
	`1504`	`+ tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc`
	`1505`	`+ codecompare smerge`
`1505`	`1506`	`"`
`1506`	`1507`
`1507`	`1508`	`_git_difftool ()`