summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-06-19 09:26:59 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-19 09:26:59 -0700
commitbd73c3f13f34ae47b956777aa4bb785b91078ee5 (patch)
treee8bb60fad5cf9b89cb79ab00233cf29b95180eda /git-mergetool.sh
parentMerge branch 'js/rebase-i-root-fix' (diff)
parentt7400: encapsulate setup code in test_expect_success (diff)
downloadtgif-bd73c3f13f34ae47b956777aa4bb785b91078ee5.tar.xz
Merge branch 'cf/submodule-progress-dissociate'
* cf/submodule-progress-dissociate: t7400: encapsulate setup code in test_expect_success
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions