| commit | 5116eab70bf8a0c8b1c29a09c4b932c4d1cf2701 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 22 Apr 2019 02:14:48 +0000 (22 11:14 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 22 Apr 2019 02:14:48 +0000 (22 11:14 +0900) | ||
| tree | 740d50373394e1421836a95a9f039f1b6b7086d4 | treesnapshot (tar.gz zip) |
| parent | 5f65d7d9bcd4bd863127df1dc10546f2b82a6b68 | commitdiff |
| parent | f57b2ae348950c0048f0091093f9d1e095d11d08 | commitdiff |
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)
"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)
| contrib/completion/git-completion.bash | diff1 | diff2 | blobhistory |