Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2019-04-04 | mergetools: add support for smerge (Sublime Merge) | David Aguilar | 1 | -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> |