From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Apr 2019 02:14:48 +0000 (+0900)
Subject: Merge branch 'da/smerge'
X-Git-Tag: v2.22.0-rc0~77
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5116eab70bf8a0c8b1c29a09c4b932c4d1cf2701?hp=--cc

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

5116eab70bf8a0c8b1c29a09c4b932c4d1cf2701