| commit | eb12adc74cf22add318f884072be2071d181abaa | |
| author | David Aguilar <davvid@gmail.com> | |
| Thu, 4 Apr 2019 07:34:38 +0000 (4 00:34 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 4 Apr 2019 09:21:25 +0000 (4 18:21 +0900) | ||
| tree | 7ed1a9baea8d2cb6a57472b647f1c009fe9c61bc | treesnapshot (tar.gz zip) |
| parent | 041f5ea1cf987a4068ef5f39ba0a09be85952064 | commitdiff |
mergetools: add support for smerge (Sublime Merge)
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>
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>
| git-mergetool--lib.sh | diffblobblamehistory | |
| mergetools/smerge | [new file with mode: 0644] | blob |