tree 740d50373394e1421836a95a9f039f1b6b7086d4
parent 5f65d7d9bcd4bd863127df1dc10546f2b82a6b68
parent f57b2ae348950c0048f0091093f9d1e095d11d08
author Junio C Hamano <gitster@pobox.com> 1555899288 +0900
committer Junio C Hamano <gitster@pobox.com> 1555899288 +0900

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)