summaryrefslogtreecommitdiff
path: root/contrib/subtree/README
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2019-04-04 00:34:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-04 18:21:25 +0900
commiteb12adc74cf22add318f884072be2071d181abaa (patch)
tree7ed1a9baea8d2cb6a57472b647f1c009fe9c61bc /contrib/subtree/README
parentThe third batch (diff)
downloadtgif-eb12adc74cf22add318f884072be2071d181abaa.tar.xz
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>
Diffstat (limited to 'contrib/subtree/README')
0 files changed, 0 insertions, 0 deletions