Merge branch 'da/smerge'

"git mergetool" learned to offer Sublime Merge (smerge) as one of
its backends.

* da/smerge:
contrib/completion: add smerge to the mergetool completion candidates
mergetools: add support for smerge (Sublime Merge)

diff --combined contrib/completion/git-completion.bash
index 93b5e972cb633fe6dd9009d05acbb7be0c976294,b6d69bcaeb18328930b1f328302f77cff390427e..42a3c8e52417d42a255c68a4f6f24a1518bb3404
--- 1/contrib/completion/git-completion.bash
--- 2/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1024,7 -1024,7 +1024,7 @@@ __git_all_commands
  __git_compute_all_commands ()
  {
        test -n "$__git_all_commands" ||
 -      __git_all_commands=$(git --list-cmds=main,others,alias,nohelpers)
 +      __git_all_commands=$(__git --list-cmds=main,others,alias,nohelpers)
  }
  
  # Lists all set config variables starting with the given section prefix,
@@@ -1501,7 -1501,8 +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 ()
@@@ -1652,9 -1653,9 +1653,9 @@@ _git_help (
        esac
        if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
        then
 -              __gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(git --list-cmds=alias,list-guide) gitk"
 +              __gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(__git --list-cmds=alias,list-guide) gitk"
        else
 -              __gitcomp "$(git --list-cmds=main,nohelpers,alias,list-guide) gitk"
 +              __gitcomp "$(__git --list-cmds=main,nohelpers,alias,list-guide) gitk"
        fi
  }
  
@@@ -2925,7 -2926,7 +2926,7 @@@ __git_main (
                        then
                                __gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
                        else
 -                              __gitcomp "$(git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
 +                              __gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
                        fi
                        ;;
                esac