diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-22 11:14:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-22 11:14:48 +0900 |
| commit | 5116eab70bf8a0c8b1c29a09c4b932c4d1cf2701 (patch) | |
| tree | 740d50373394e1421836a95a9f039f1b6b7086d4 /builtin/commit.c | |
| parent | 5f65d7d9bcd4bd863127df1dc10546f2b82a6b68 (diff) | |
| parent | f57b2ae348950c0048f0091093f9d1e095d11d08 (diff) | |
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)
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions