summaryrefslogtreecommitdiff
path: root/t/perf/p4001-diff-no-index.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-04-22 11:14:48 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-22 11:14:48 +0900
commit5116eab70bf8a0c8b1c29a09c4b932c4d1cf2701 (patch)
tree740d50373394e1421836a95a9f039f1b6b7086d4 /t/perf/p4001-diff-no-index.sh
parentMerge branch 'dl/flex-str-cocci' (diff)
parentcontrib/completion: add smerge to the mergetool completion candidates (diff)
downloadtgif-5116eab70bf8a0c8b1c29a09c4b932c4d1cf2701.tar.xz
Merge branch 'da/smerge'
"git mergetool" learned to offer Sublime Merge (smerge) as one of its backends. * da/smerge: contrib/completion: add smerge to the mergetool completion candidates mergetools: add support for smerge (Sublime Merge)
Diffstat (limited to 't/perf/p4001-diff-no-index.sh')
0 files changed, 0 insertions, 0 deletions