Merge branch 'da/smerge'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2019 02:14:48 +0000 (11:14 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Apr 2019 02:14:48 +0000 (11:14 +0900)
"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)

1  2 
contrib/completion/git-completion.bash