summaryrefslogtreecommitdiff
path: root/mergetools/smerge
AgeCommit message (Collapse)AuthorFilesLines
2019-04-04mergetools: add support for smerge (Sublime Merge)Libravatar David Aguilar1-0/+12
Teach difftool and mergetool about the Sublime Merge "smerge" command. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>