summaryrefslogtreecommitdiff
path: root/t/t5521-pull-options.sh
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2019-04-04 00:34:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-04 18:21:26 +0900
commitf57b2ae348950c0048f0091093f9d1e095d11d08 (patch)
treeb4168c0348e392680bcb3036dd7bd66743631437 /t/t5521-pull-options.sh
parentmergetools: add support for smerge (Sublime Merge) (diff)
downloadtgif-f57b2ae348950c0048f0091093f9d1e095d11d08.tar.xz
contrib/completion: add smerge to the mergetool completion candidates
Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5521-pull-options.sh')
0 files changed, 0 insertions, 0 deletions